- fix create task

- new project created time reassign
- copy project created time reassign
- save project (create task, copy task, delete task)

src/components/admin/app-navbar/AppNavbar.vue

@@ -25,12 +25,12 @@
         >
           <!-- *** icon -->
           <!-- <va-icon-vuestic /> -->
-          <img src='@/assets/img/bps_logo.png'>
+          <!-- <img src='@/assets/img/bps_logo.png'> -->
         </router-link>
       </div>
       <!-- <img style="height: 40px;" v-bind:src="'https://www.bioproweb.com/wp-content/uploads/2020/01/BPS-LOGO_60.png'"> -->
       <div class="app-navbar__center lg5 md4">
-        <span
+        <!-- <span
           class="app-navbar__text"
           :style="{color: this.$themes.gray}"
         >
@@ -43,7 +43,7 @@
           >
             contact@bioproweb.com
           </a>
-        </span>
+        </span> -->
       </div>
       <app-navbar-actions
         class="app-navbar__actions md5 lg4"

src/components/project/Project.vue

@@ -15,6 +15,7 @@
       :mask-color="'rgba(0, 0, 0, 0)'"
       :visible.sync="taskViewPanel.show"
       :title="(taskViewPanel.type === 1) ? 'Device' : (taskViewPanel.type === 3) ? 'Condition' : (taskViewPanel.type === 4) ? 'Parameter' : ''"
+      @closed="onClosing"
       resizable
     >
       <project-task/>
@@ -100,6 +101,9 @@ export default {
     },
   },
   methods: {
+    onClosing: async function () {
+      await this.saveProject(this.getSelectProject)
+    },
     pageToast: function (mes) {
       this.showToast(
         mes,
@@ -163,14 +167,6 @@ export default {
     },
     saveProject: async function (project) {
       this.updateProject({ project: project, api: this.API })
-      this.showToast(
-        'project update finish',
-        {
-          icon: 'fa-bell',
-          position: 'bottom-right',
-          duration: 5000,
-        },
-      )
     },
     detect: async function (device) {
       this.mqttPub(taskInfo.getTaskInfo().controllerID + '_user', JSON.stringify({

src/components/project/manager/ProjectManagerList.vue

@@ -40,13 +40,20 @@ export default {
   },
   computed: {
     configList () {
-      if (this.filterText === '') return this.projectConfigList
-      return this.projectConfigList.filter(ele => ele.name.includes(this.filterText))
+      const projectList = this.projectConfigList
+      projectList.sort((a, b) => {
+        const date1 = new Date(a.created_at).getTime()
+        const date2 = new Date(b.created_at).getTime()
+        return date2 - date1
+      })
+      if (this.filterText === '') return projectList
+      return projectList.filter(ele => ele.name.includes(this.filterText))
     },
 
     ...mapFields('project', [
       'projectConfigList',
       'projectSelectIndex',
+      'projectTableSelectIndex',
     ]),
   },
   data () {
@@ -83,6 +90,7 @@ export default {
     select: function (index) {
       this.selectProjectIndex = index
       this.selectDeleteIndex = -1
+      this.projectTableSelectIndex = -1
       this.selectProject({ index: index })
     },
 

src/components/project/task/config/ProjectTaskConfigDevice.vue

@@ -61,7 +61,10 @@ export default {
     },
 
     taskDevice () {
-      return this.getSelectTask.device
+      if (this.getSelectTask.device) {
+        return this.getSelectTask.device
+      }
+      return null
     },
     ...mapGetters('project', [
       types.project.getSelect,

src/components/project/task/config/ProjectTaskConfigParameter.vue

@@ -67,7 +67,8 @@ export default {
       condition.select = !condition.select
     },
     setParameter: function (name, value) {
-      this.parameter = Object.assign({}, this.parameter)
+      // this.parameter = Object.assign({}, this.parameter)
+      this.parameter[name] = value
 
       if (this.parameterUUID === '') {
         this.parameterUUID = this.GLOBAL.getUUID()
@@ -106,7 +107,7 @@ export default {
         this.parameterUUID = Object.keys(parameterSet)[0]
         const param = Object.values(parameterSet)[0]
         const modeOption = this.$refs.device_parameter_ref.workingModeOptions.find(ele => ele.id === param.MODE)
-        this.$refs.device_parameter_ref.workingModeSelectChange(modeOption)
+        this.$refs.device_parameter_ref.workingModeSelectChange(modeOption, false)
         this.parameter = Object.assign(this.parameter, Object.values(parameterSet)[0])
       } else {
         const defaultMode = this.config.MODE_OPTIONS.find(ele => ele.description === 'Idle')

src/components/project/view/ProjectView.vue

@@ -13,7 +13,7 @@
       </div>
       <div v-else>
         <project-menu @detect="detect" @save_project="save"/>
-        <project-table/>
+        <project-table @save="save"/>
         <div align="right" v-if="lockMode === false">
           <button class="project-start-btn" @click="start">
             <div>

src/components/project/view/menu/ProjectMenu.vue

@@ -1,7 +1,8 @@
 <template>
   <div>
+    <project-device @showDeviceModal="showDeviceModal" @save="saveProject"></project-device>
     <div class="flex d-flex sm12 xs12 md6 xl4 px-0">
-      <add-task/>
+      <add-task @save="saveProject"/>
       <div>
         <button class="add-cycle-btn" @click="showCycleModal">
           <div class="add-cycle-text">
@@ -10,23 +11,28 @@
         </button>
       </div>
       <div>
-        <button class="copy-project-btn" @click="copyTask({ project: getSelectProject, index: projectTableSelectIndex})">
+        <button class="copy-project-btn" @click="() => {
+          copyTask({ project: getSelectProject, index: projectTableSelectIndex})
+          saveProject()
+        }">
           <img class="img-vertical-center" src="@/assets/img/project/copy.svg">
         </button>
       </div>
       <div>
-        <button class="copy-project-btn" @click="saveProject">
+        <button class="copy-project-btn" @click="saveProject(true)">
           <img class="img-vertical-center" src="@/assets/img/project/save.svg">
         </button>
       </div>
       <div>
-        <button class="copy-project-btn" @click="deleteTask({ project: getSelectProject, index: projectTableSelectIndex})">
+        <button class="copy-project-btn" @click="() => {
+          deleteTask({ project: getSelectProject, index: projectTableSelectIndex})
+          saveProject()
+        }">
           <img class="img-vertical-center" src="@/assets/img/project/delete.svg">
         </button>
       </div>
     </div>
-    <project-device @showDeviceModal="showDeviceModal"></project-device>
-    <new-device-modal ref="device_modal_ref" @detect="detect"></new-device-modal>
+    <new-device-modal ref="device_modal_ref" @detect="detect" @save="saveProject"></new-device-modal>
     <cycle-modal ref="cycle_modal_ref" @createCycle="createCycle"></cycle-modal>
   </div>
 </template>
@@ -82,7 +88,17 @@ export default {
       this.$refs.cycle_modal_ref.show()
       this.$refs.cycle_modal_ref.reset()
     },
-    saveProject: function () {
+    saveProject: function (showMessage = false) {
+      if (showMessage === true) {
+        this.showToast(
+          'project update finish',
+          {
+            icon: 'fa-bell',
+            position: 'bottom-right',
+            duration: 5000,
+          },
+        )
+      }
       this.$emit('save_project', this.getSelectProject)
     },
 

src/components/project/view/menu/components/AddTask.vue

@@ -1,6 +1,9 @@
 <template>
   <div>
-    <button class="add-task-btn" @click="createTask">
+    <button class="add-task-btn" @click="() => {
+      createTask()
+      save()
+    }">
       <div class="add-task-text">
         <p>Add Task</p>
       </div>
@@ -22,13 +25,12 @@ export default {
     }
   },
   methods: {
+    save: function () {
+      this.$emit('save')
+    },
     ...mapActions('project',
       [
-        types.task.init,
         types.task.create,
-        types.task.save,
-        types.task.delete,
-        types.task.select,
       ],
     ),
   },

src/components/project/view/menu/components/CycleModal.vue

@@ -135,7 +135,6 @@ export default {
       this.showModal = false
     },
     createCycle: async function () {
-      this.showModal = false
       const project = this.getSelectProject
       if (Object.keys(this.cycleInfo).length === 0) {
         this.$emit('createCycle', this.task)
@@ -182,7 +181,8 @@ export default {
           await this.swapTask({ project: project, originIndex: originEndIndex, newIndex: newEndIndex + 1 })
         }
       }
-
+      this.$emit('save')
+      this.showModal = false
       return true
     },
     removeCycle: async function () {
@@ -199,6 +199,7 @@ export default {
       const originEndIndex = await this.getIndexTask({ project: project, uuid: this.cycleInfo.range[1] })
       await this.deleteTask({ project: project, index: originEndIndex })
 
+      this.$emit('save')
       this.showModal = false
       return true
     },

src/components/project/view/menu/components/NewDeviceModal.vue

@@ -101,10 +101,12 @@ export default {
       if (this.deviceList[this.deviceSelect]) {
         this.device.pair = this.deviceList[this.deviceSelect].macAddress
       }
+      this.$emit('save')
       this.hide()
     },
     removeDevice: function () {
       this.deleteDeviceProject({ deviceKey: this.key })
+      this.$emit('save')
       this.hide()
     },
     getDeviceList: async function (device) {

src/components/project/view/menu/components/ProjectDevice.vue

@@ -92,6 +92,7 @@ export default {
         pairStatus: 1,
         order: this.getDeviceMaxOrderProject,
       })
+      this.$emit('save')
       return true
     },
     clickShowDevice: async function (library) {
@@ -103,6 +104,7 @@ export default {
         pairStatus: 0,
         order: this.getDeviceMaxOrderProject,
       })
+      this.$emit('save')
       return false
     },
     cancelSelectDevice: function () {
@@ -113,6 +115,7 @@ export default {
     },
     deleteDevice: function (deviceIndex) {
       this.deleteDeviceProject({ index: deviceIndex })
+      this.$emit('save')
     },
     handleMove (e) {
       const { index, futureIndex } = e.draggedContext
@@ -131,6 +134,7 @@ export default {
         deviceList[keyOld][key] = deviceListTemp[this.futureIndex][1][key]
         deviceList[keyNew][key] = deviceListTemp[this.index][1][key]
       }
+      this.$emit('save')
     },
     ...mapActions('project',
       [

src/components/project/view/table/ProjectTable.vue

@@ -15,7 +15,10 @@
           </tr>
         </thead>
         <!-- <tbody> -->
-        <vuedraggable :disabled="lockMode === true || inputMode === true" class="draggable" :list="getSelectProject.task" @end="rearrangeTask({ project: getSelectProject })" tag="tbody" animation="500">
+        <vuedraggable :disabled="lockMode === true || inputMode === true" class="draggable" :list="getSelectProject.task" @end="()=> {
+          rearrangeTask({ project: getSelectProject })
+          saveProject()
+        }" tag="tbody" animation="500">
           <template class="item" v-for="(task, taskIndex) in getSelectProject.task">
             <tr
               v-if="task.type === 'cycle'"
@@ -204,7 +207,10 @@
                       <template slot="popover">
                         <div>
                           <div v-for="(parameter) in parameterShow(parameterSet.MODE, deviceUUID)" :key="parameter + parameterSet.MODE">
-                            <p>
+                            <p v-if="getConfig(deviceUUID).includes('TRIG') === true">
+                              {{ parameterPair(parameter, parameterSet, deviceUUID) }}
+                            </p>
+                            <p v-else>
                               {{ parameterName(parameter, deviceUUID) }} : {{ parameterValue(parameter, parameterSet[parameter], deviceUUID) }}
                             </p>
                           </div>
@@ -251,7 +257,7 @@
       </table>
     </div>
     <div>
-      <cycle-modal ref="cycle_modal_ref"></cycle-modal>
+      <cycle-modal ref="cycle_modal_ref" @save="saveProject"></cycle-modal>
     </div>
   </div>
 </template>
@@ -357,6 +363,7 @@ export default {
       if (a === undefined) return
       newTaskList.filter(ele => ele != null)
       this.rearrangeTask({ project: this.getSelectProject })
+      this.saveProject()
     },
     swapTask: function (taskIndex, upDown) {
       taskIndex = parseInt(taskIndex)
@@ -370,11 +377,13 @@ export default {
         this.getSelectProject.task.splice(taskIndex + 1, 1, a)
       }
       this.rearrangeTask({ project: this.getSelectProject })
+      this.saveProject()
     },
     delSelected: function () {
       for (const indexSelected of this.tableColumn.checked) {
         this.deleteTask({ project: this.getSelectProject, index: indexSelected })
       }
+      this.saveProject()
     },
     delAction: function (task, actionKey, conditionKey) {
       const _action = JSON.parse(JSON.stringify(task.action))
@@ -385,6 +394,12 @@ export default {
 
       task.action = _action
       task.condition = _condition
+
+      this.saveProject()
+    },
+    saveProject: function () {
+      console.log('saveProject')
+      this.$emit('save', this.getSelectProject)
     },
     trigger_button: function (projectID) {
       console.log('project', projectID)
@@ -407,6 +422,8 @@ export default {
         this.inputMode = false
         this.tableColumn[tag] = -1
       }
+
+      this.saveProject()
     },
     switchCycle: function (tag, index, projectID, task) {
       this.switchInput(tag, index)
@@ -419,6 +436,7 @@ export default {
         index: cycleInfo[0],
         content: { id: this.inputSaved },
       }))
+      this.$emit('save', this.getSelectProject)
     },
     selectAll: function (selectedArray) {
       const totalRange = [...Array(this.getSelectProject.task.length).keys()].map(idx => String(idx))
@@ -448,9 +466,44 @@ export default {
     parameterShow (mode, deviceKey) {
       const config = configTable.getConfig(this.getDeviceLibraryProject(deviceKey))
       if (config !== undefined && Object.keys(config) !== 0) {
+        if (this.getDeviceLibraryProject(deviceKey).includes('TRIG')) return config.MODE[mode].showParameter
         return config.MODE[mode].parameter
       }
     },
+    parameterPair (name, valueSet, deviceKey) {
+      let _name, _value
+      const config = configTable.getConfig(this.getDeviceLibraryProject(deviceKey))
+      if (config !== undefined && Object.keys(config) !== 0) {
+        if (this.getDeviceLibraryProject(deviceKey).includes('TRIG')) {
+          if (name.includes('ACC_a_out')) {
+            const accName = name + '_current'
+            if (Boolean(valueSet[name]) === true) {
+              _name = 'Channel' + String((parseInt(name.replace('ACC_a_out', '')) + 1))
+              const scale = config[accName].unit[config[accName].defaultUnit]
+              _value = `${config[accName].outputReadabilityData(valueSet[accName], scale)} ${config[accName].defaultUnit}`
+            } else return ''
+          } else if (name.includes('TRIG')) {
+            if (Boolean(valueSet[name]) === true) {
+              const optionTrigger = [
+                'RISING',
+                'FALLING',
+                'BOTH',
+              ]
+              const trigName = name.replace('en', '') + 'edge_type'
+              _name = 'TRIG' + String((parseInt(name.replace('TRIG', '').replace('_en', '')) + 1))
+              _value = optionTrigger[valueSet[trigName]]
+            } else return ''
+          } else if (name.includes('TIME_DURATION')) {
+            if (valueSet.TIME_DURATION && parseInt(valueSet.TIME_DURATION) > 0) {
+              const scale = config[name].unit[config[name].defaultUnit]
+              _name = 'Timer'
+              _value = `${config[name].outputReadabilityData(valueSet[name], scale)} ${config[name].defaultUnit}`
+            } else return ''
+          }
+        }
+      }
+      return _name + ': ' + _value
+    },
     parameterName (name, deviceKey) {
       const config = configTable.getConfig(this.getDeviceLibraryProject(deviceKey))
       if (config !== undefined && Object.keys(config) !== 0) {
@@ -498,6 +551,10 @@ export default {
       return cycleInfo[1]
     },
 
+    getConfig: function (deviceKey) {
+      return this.getDeviceLibraryProject(deviceKey)
+    },
+
     handleMove (e) {
       const { index, futureIndex } = e.draggedContext
       this.index = index

src/components/task/content/chart/CanvasChartRealTimeDisplay.vue

@@ -137,9 +137,22 @@ export default {
       if (this.data !== undefined && this.data.gridSource !== undefined) {
         let _xPhysicsQuantity = this.data.gridSource[plotIndex][curveIndex].name.split('_')[0].split('-').at(-1)
         let _yPhysicsQuantity = this.data.gridSource[plotIndex][curveIndex].name.split('_')[1].split('-').at(-1)
+        // console.log('1', _xPhysicsQuantity, _yPhysicsQuantity)
+        if (!_xPhysicsQuantity.includes('ZReal') && !_xPhysicsQuantity.includes('ZImag')) {
+          _xPhysicsQuantity = _xPhysicsQuantity.substring(0, 1)
+        } else {
+          _xPhysicsQuantity = _xPhysicsQuantity.substring(0, 5)
+        }
+        if (!_yPhysicsQuantity.includes('ZReal') && !_yPhysicsQuantity.includes('ZImag')) {
+          _yPhysicsQuantity = _yPhysicsQuantity.substring(0, 1)
+        } else {
+          _yPhysicsQuantity = _yPhysicsQuantity.substring(0, 5)
+        }
+        // console.log('2', _xPhysicsQuantity, _yPhysicsQuantity)
         // Potential
         if (_xPhysicsQuantity === 'P') _xPhysicsQuantity = 'V'
         if (_yPhysicsQuantity === 'P') _yPhysicsQuantity = 'V'
+        // console.log('2', _xPhysicsQuantity, _yPhysicsQuantity)
         const [_xAxis, _yAxis] = this.chartRouter.getChartTable(_xPhysicsQuantity, _yPhysicsQuantity)
         const _realTime = JSON.parse(JSON.stringify(this.realTime))
         const _newCurve = {}

src/components/task/content/controller/TaskDeviceListNew.vue

@@ -22,7 +22,7 @@
             <va-item-section class="ml-3" caption>
               <!-- <va-button @click="getBattery(device)"> get battery </va-button> -->
               <!-- <pre> {{ device.battery }} </pre> -->
-              <va-item-label v-if="device.library_name.includes('EIS')">
+              <va-item-label v-if="device.library_name.includes('EIS') || device.library_name.includes('TRIG')">
                 {{ `[${device.memory_board}]` }} {{ device.name }}
               </va-item-label>
               <va-item-label v-else-if="parseInt((device.battery - 2900) / 10) >= 75">

src/components/task/content/parameter/DeviceParameterRecording.vue

@@ -48,7 +48,7 @@
         />
       </div>
       <!-- ZM15-PulseSensingMode -->
-      <div v-else-if="library && library.includes('EDC') && parameter.MODE === 14">
+      <div v-else-if="library && (library.includes('EDC') || library.includes('BAT')) && parameter.MODE === 14">
         <EliteParameterRecordingElitePulseSensing
           :parameter="parameter"
           :device="device"
@@ -59,7 +59,7 @@
         />
       </div>
       <!-- ZM15-DPVMode -->
-      <div v-else-if="library && library.includes('EDC') && parameter.MODE === 15">
+      <div v-else-if="library && (library.includes('EDC') || library.includes('BAT')) && parameter.MODE === 15">
         <EliteParameterRecordingEliteDPV
           :parameter="parameter"
           :device="device"
@@ -70,7 +70,7 @@
         />
       </div>
       <!-- ZM15-OtherModes -->
-      <div v-else-if="library && library.includes('EDC')">
+      <div v-else-if="library && (library.includes('EDC') || library.includes('BAT'))">
         <va-tree-category
           v-for="name in parameterArrayInMode"
           :key="name"
@@ -257,16 +257,18 @@ export default {
     },
     refresh () {
     },
-    workingModeSelectChange (val) {
-      if (val === undefined) return
+    workingModeSelectChange (val, reset = true) {
+      if (val === undefined || this.parameter.MODE === undefined) return
       this.workingModeSelect = val
       // console.log('workingModeSelectChange', this.workingModeSelect, this.parameter.MODE)
 
       if (this.workingModeSelect.id !== this.parameter.MODE) {
         this.parameterChange('MODE', this.workingModeSelect.id)
         if (this.resetParameterModeChange === true) {
-          for (const parameter of this.parameterTable.MODE[this.workingModeSelect.id].parameter) {
-            this.$emit('setParameter', parameter, this.parameterTable[parameter].defaultValue)
+          if (reset === true) {
+            for (const parameter of this.parameterTable.MODE[this.workingModeSelect.id].parameter) {
+              this.$emit('setParameter', parameter, this.parameterTable[parameter].defaultValue)
+            }
           }
         }
 

src/components/task/content/parameter/itemNew/TriggerNew/ChannelBlock.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="flex sm12 xl12 md12 xs12 mb-2 pb-1 align--center">
     <div class="row">
-      <div class="flex sm4 xl4 md4 xs4 my-1 py-0">
+      <div class="flex sm12 xl5 md5 xs12 my-1 py-0">
         <p class="display-6"> CHANNEL {{ Number(channel) + 1 }} <p/>
       </div>
-      <div class="flex sm3 xl3 md3 xs3 px-0 mx-0 my-0 py-0">
+      <div class="flex sm12 xl3 md3 xs12 px-0 mx-0 my-0 py-0">
         <va-input
           class="mb-0 small-va-input"
           v-model="inputStringText"
@@ -17,8 +17,8 @@
           </p>
         </va-input>
       </div>
-      <div class="flex sm5 xl5 md5 xs5 px-0 mx-0 my-0 py-0">
-        <va-toggle class="mb-0" v-model="channelToggle" color="success" style="float: right;" flat small @click.native="switchToggle()"/>
+      <div class="flex sm12 xl4 md4 xs12 px-0 mx-0 my-0 py-0">
+        <va-toggle class="mb-0" v-model="toggle" color="success" style="float: right;" flat small @click.native="switchToggle()"/>
       </div>
     </div>
     <div class="sm11 xl12 md12 xs12 my-1 py-1">
@@ -28,8 +28,8 @@
         :max="outputReadabilityData(range.max)"
         value-visible
         :step="10"
-        :color="channelToggle === true ? 'primary' : 'gray'"
-        :disabled="!channelToggle"
+        :color="toggle === true ? 'primary' : 'gray'"
+        :disabled="!toggle"
         v-model="inputSlider"
       />
     </div>
@@ -42,6 +42,14 @@ export default {
   components: {
   },
   computed: {
+    toggle: {
+      get () {
+        return Boolean(this.inputValue[this.toggleName])
+      },
+      set (val) {
+        this.channelToggle = val
+      },
+    },
     inputStringText: {
       get () {
         return String(this.outputReadabilityData(this.inputValue[this.parameterName]))
@@ -98,7 +106,7 @@ export default {
   data () {
     return {
       inputString: '',
-      channelToggle: Boolean(this.inputValue[this.toggleName]),
+      channelToggle: false,
     }
   },
   mqtt: {

src/components/task/content/parameter/itemNew/TriggerNew/TimerBlock.vue

@@ -1,14 +1,14 @@
 <template>
   <div class="flex sm12 xl12 md12 xs12 mb-2 pb-1 align--center">
     <div class="row">
-      <div class="flex sm4 xl4 md4 xs4 my-1 py-0">
+      <div class="flex sm12 xl5 md5 xs12 my-1 py-0">
         <p class="display-6 my-2"> Timer <p/>
       </div>
-      <div class="flex sm3 xl3 md3 xs3 px-0 mx-0 my-2 py-0">
+      <div class="flex sm12 xl3 md3 xs12 px-0 mx-0 my-2 py-0">
         <va-input
           class="mb-0 small-va-input"
           v-model="inputStringText"
-          :disabled="!timerToggle"
+          :disabled="!toggle"
           @keyup.enter="inputChange(inputString)"
           @blur="inputChange(inputString)"
         >
@@ -17,8 +17,8 @@
           </p>
         </va-input>
       </div>
-      <div class="flex sm5 xl5 md5 xs5 px-0 mx-0 my-2 py-0">
-        <va-toggle class="mb-0" v-model="timerToggle" color="success" style="float: right;" flat small @click.native="switchToggle()"/>
+      <div class="flex sm12 xl4 md4 xs12 px-0 mx-0 my-2 py-0">
+        <va-toggle class="mb-0" v-model="toggle" color="success" style="float: right;" flat small @click.native="switchToggle()"/>
       </div>
     </div>
     <!-- <div class="sm11 xl12 md12 xs12 my-1 py-1">
@@ -58,6 +58,14 @@ export default {
         this.inputChange(val)
       },
     },
+    toggle: {
+      get () {
+        return !(this.inputValue[this.parameterName] === 0)
+      },
+      set (val) {
+        this.timerToggle = val
+      },
+    },
   },
   props: {
     inputValue: {
@@ -90,7 +98,7 @@ export default {
   data () {
     return {
       inputString: '',
-      timerToggle: !(this.inputValue[this.parameterName] === 0),
+      timerToggle: false,
     }
   },
   mqtt: {

src/components/task/content/parameter/itemNew/TriggerNew/Trigger.vue

@@ -1,37 +1,39 @@
 <template>
   <div>
-    <div v-for="channel in channelList" :key="channel">
-      <ChannelBlock
-        :channel="channel"
-        :inputValue="parameter"
-        :parameterName="channelBlockCurrent(channel)"
-        :toggleName="channelBlockToggle(channel)"
-        v-bind="parameterTable[channelBlockCurrent()]"
-        @parameterChange="parameterChange"
-      ></ChannelBlock>
-    </div>
-    <div class="row px-0 mx-0">
-      <p class="my-2 mr-2 display-5"> ADVANCED SETTING </p>
-      <!-- <va-toggle class="mb-0" flat small color="success" v-model="openAdvanced"/> -->
-    </div>
-    <div>
-      <TimerBlock
-        :inputValue="parameter"
-        :parameterName="'TIME_DURATION'"
-        v-bind="parameterTable.TIME_DURATION"
-        @parameterChange="parameterChange"
-      ></TimerBlock>
-    </div>
-    <div>
-      <div v-for="triggerIndex in triggerList" :key="'trigger_' + triggerIndex">
-        <TriggerBlock
-          :triggerIndex="triggerIndex"
+    <div v-if="parameter.MODE === 0">
+      <div v-for="channel in channelList" :key="channel">
+        <ChannelBlock
+          :channel="channel"
           :inputValue="parameter"
-          :parameterName="triggerBlockType(triggerIndex)"
-          :toggleName="triggerBlockEnable(triggerIndex)"
-          v-bind="parameterTable[triggerBlockType()]"
+          :parameterName="channelBlockCurrent(channel)"
+          :toggleName="channelBlockToggle(channel)"
+          v-bind="parameterTable[channelBlockCurrent(channel)]"
           @parameterChange="parameterChange"
-        ></TriggerBlock>
+        ></ChannelBlock>
+      </div>
+      <div class="row px-0 mx-0">
+        <p class="my-2 mr-2 display-5"> ADVANCED SETTING </p>
+      <!-- <va-toggle class="mb-0" flat small color="success" v-model="openAdvanced"/> -->
+      </div>
+      <div>
+        <TimerBlock
+          :inputValue="parameter"
+          :parameterName="'TIME_DURATION'"
+          v-bind="parameterTable.TIME_DURATION"
+          @parameterChange="parameterChange"
+        ></TimerBlock>
+      </div>
+      <div>
+        <div v-for="triggerIndex in triggerList" :key="'trigger_' + triggerIndex">
+          <TriggerBlock
+            :triggerIndex="triggerIndex"
+            :inputValue="parameter"
+            :parameterName="triggerBlockType(triggerIndex)"
+            :toggleName="triggerBlockEnable(triggerIndex)"
+            v-bind="parameterTable[triggerBlockType()]"
+            @parameterChange="parameterChange"
+          ></TriggerBlock>
+        </div>
       </div>
     </div>
   </div>

src/components/task/content/parameter/itemNew/TriggerNew/TriggerBlock.vue

@@ -2,10 +2,10 @@
   <div class="row flex sm12 xl12 md12 xs12 ma-0 pa-0">
     <div class="d-flex sm12 xl12 md12 xs12 my-0 py-0">
       <div class="flex sm8 xl8 md8 xs8 my-1 py-0">
-        <p class="display-6 my-2"> TRIGGER IN {{ triggerIndex }} <p/>
+        <p class="display-6 my-2"> TRIGGER IN {{ triggerIndex + 1 }} <p/>
       </div>
       <div class="flex sm4 xl4 md4 xs4 ma-0 pa-0 my-2">
-        <va-toggle class="mb-0" v-model="triggerToggle" color="success" style="float: right;" flat small @click.native="switchToggle()"/>
+        <va-toggle class="mb-0" v-model="toggle" color="success" style="float: right;" flat small @click.native="switchToggle()"/>
       </div>
     </div>
     <div class="flex sm12 xl12 md12 xs12 pa-0 ma-0">
@@ -16,7 +16,7 @@
         v-model="selectTrigger"
         :option="optionTrigger[index]"
         :label="optionTrigger[index]"
-        :disabled="!triggerToggle"
+        :disabled="!toggle"
         @click.native.stop="inputChange(index)"
       />
     </div>
@@ -62,6 +62,16 @@ export default {
       default: (val) => val,
     },
   },
+  computed: {
+    toggle: {
+      get () {
+        return Boolean(this.inputValue[this.toggleName])
+      },
+      set (val) {
+        this.triggerToggle = val
+      },
+    },
+  },
   created () {
   },
   data () {

src/data/config-table/EliteEDC/index.js

@@ -520,7 +520,7 @@ const EliteZM15 = {
       return parseInt((parseFloat(val) - 25000) / 5) / scale
     },
   },
-  VOLT_VSCAN: {
+  CA_VOLT: {
     type: 'number',
     showName: 'Volt (v.s. ref)',
     componentType: 'input-range',

src/data/config-table/EliteEIS/index.js

@@ -158,7 +158,7 @@ const EliteEIS = {
     outputReadabilityData: (val, scale = 1) => {
       return Math.round(parseInt(val) / 2047 * 800) / scale
     },
-    defaultValue: 25,
+    defaultValue: 26,
     defaultUnit: 'mV',
     downloadUnit: 'mV',
     unit: {
@@ -289,7 +289,7 @@ const EliteEIS = {
     outputReadabilityData: (val, scale = 1) => {
       return Math.round(parseInt(val) / 2047 * 800) / scale
     },
-    defaultValue: 25,
+    defaultValue: 26,
     defaultUnit: 'mV',
     downloadUnit: 'mV',
     unit: {

src/data/config-table/EliteTrigger/ACC.js

@@ -0,0 +1,24 @@
+export default {
+  name: 'ACC',
+  parameter: ['TIME_DURATION', 'ACC_a_out0', 'ACC_a_out1', 'ACC_a_out2', 'ACC_a_out3', 'ACC_a_out0_current', 'ACC_a_out1_current', 'ACC_a_out2_current', 'ACC_a_out3_current', 'TRIG0_en', 'TRIG1_en', 'TRIG0_edge_type', 'TRIG1_edge_type'], // 這個mode用到的參數
+  showParameter: ['ACC_a_out0', 'ACC_a_out1', 'ACC_a_out2', 'ACC_a_out3', 'TRIG0_en', 'TRIG1_en', 'TIME_DURATION'], // 有要秀給user看的參數
+  headerParameter: () => [], // export header的參數
+  valScales: {
+    linear: {
+      func: (val) => {
+        return val
+      },
+    },
+    log: {
+      func: (val) => {
+        return Math.log10(Math.abs(val))
+      },
+    },
+  },
+  channels: {
+  },
+  charts: {
+    default: [
+    ],
+  },
+}

src/data/config-table/EliteTrigger/index.js

@@ -1,4 +1,5 @@
 import Idle from '../Common/Idle'
+import ACC from './ACC'
 
 const EliteTrigger = {
   TIME_DURATION: {
@@ -22,9 +23,9 @@ const EliteTrigger = {
       return parseInt(parseFloat(val))
     },
   },
-  ACC_a_out: {
+  ACC_a_out0: {
     type: 'number',
-    showName: 'ACC OUT enable',
+    showName: 'Channel 1 Enable',
     componentType: 'channelBlock',
     range: Object.freeze({ min: 0, max: 1 }), // UI上能輸入的最大最小值
     defaultValue: 0,
@@ -38,9 +39,57 @@ const EliteTrigger = {
       return parseInt(val)
     },
   },
-  ACC_a_out_current: {
+  ACC_a_out1: {
     type: 'number',
-    showName: 'ACC OUT CURRENT',
+    showName: 'Channel 2 Enable',
+    componentType: 'channelBlock',
+    range: Object.freeze({ min: 0, max: 1 }), // UI上能輸入的最大最小值
+    defaultValue: 0,
+    defaultUnit: null,
+    downloadUnit: null,
+    unit: {},
+    outputRawData: (val) => {
+      return parseInt(val)
+    },
+    outputReadabilityData: (val) => {
+      return parseInt(val)
+    },
+  },
+  ACC_a_out2: {
+    type: 'number',
+    showName: 'Channel 3 Enable',
+    componentType: 'channelBlock',
+    range: Object.freeze({ min: 0, max: 1 }), // UI上能輸入的最大最小值
+    defaultValue: 0,
+    defaultUnit: null,
+    downloadUnit: null,
+    unit: {},
+    outputRawData: (val) => {
+      return parseInt(val)
+    },
+    outputReadabilityData: (val) => {
+      return parseInt(val)
+    },
+  },
+  ACC_a_out3: {
+    type: 'number',
+    showName: 'Channel 4 Enable',
+    componentType: 'channelBlock',
+    range: Object.freeze({ min: 0, max: 1 }), // UI上能輸入的最大最小值
+    defaultValue: 0,
+    defaultUnit: null,
+    downloadUnit: null,
+    unit: {},
+    outputRawData: (val) => {
+      return parseInt(val)
+    },
+    outputReadabilityData: (val) => {
+      return parseInt(val)
+    },
+  },
+  ACC_a_out0_current: {
+    type: 'number',
+    showName: 'Channel 1 Current',
     componentType: 'channelBlock',
     range: Object.freeze({ min: 0, max: 50000 }), // UI上能輸入的最大最小值
     defaultValue: 0,
@@ -56,9 +105,63 @@ const EliteTrigger = {
       return val / 250
     },
   },
-  TRIG_en: {
+  ACC_a_out1_current: {
     type: 'number',
-    showName: 'trigger enable',
+    showName: 'Channel 2 Current',
+    componentType: 'channelBlock',
+    range: Object.freeze({ min: 0, max: 50000 }), // UI上能輸入的最大最小值
+    defaultValue: 0,
+    defaultUnit: 'mA',
+    downloadUnit: null,
+    unit: {
+      mA: 1,
+    },
+    outputRawData: (val) => {
+      return val * 250
+    },
+    outputReadabilityData: (val) => {
+      return val / 250
+    },
+  },
+  ACC_a_out2_current: {
+    type: 'number',
+    showName: 'Channel 3 Current',
+    componentType: 'channelBlock',
+    range: Object.freeze({ min: 0, max: 50000 }), // UI上能輸入的最大最小值
+    defaultValue: 0,
+    defaultUnit: 'mA',
+    downloadUnit: null,
+    unit: {
+      mA: 1,
+    },
+    outputRawData: (val) => {
+      return val * 250
+    },
+    outputReadabilityData: (val) => {
+      return val / 250
+    },
+  },
+  ACC_a_out3_current: {
+    type: 'number',
+    showName: 'Channel 4 Current',
+    componentType: 'channelBlock',
+    range: Object.freeze({ min: 0, max: 50000 }), // UI上能輸入的最大最小值
+    defaultValue: 0,
+    defaultUnit: 'mA',
+    downloadUnit: null,
+    unit: {
+      mA: 1,
+    },
+    outputRawData: (val) => {
+      return val * 250
+    },
+    outputReadabilityData: (val) => {
+      return val / 250
+    },
+  },
+  TRIG0_en: {
+    type: 'number',
+    showName: 'Trigger 0 Enable',
     componentType: 'triggerBlock',
     range: Object.freeze({ min: 0, max: 1 }), // UI上能輸入的最大最小值
     defaultValue: 0,
@@ -72,9 +175,41 @@ const EliteTrigger = {
       return parseInt(val)
     },
   },
-  TRIG_edge_type: {
+  TRIG1_en: {
     type: 'number',
-    showName: 'trigger type',
+    showName: 'Trigger 1 Enable',
+    componentType: 'triggerBlock',
+    range: Object.freeze({ min: 0, max: 1 }), // UI上能輸入的最大最小值
+    defaultValue: 0,
+    defaultUnit: null,
+    downloadUnit: null,
+    unit: {},
+    outputRawData: (val) => {
+      return parseInt(val)
+    },
+    outputReadabilityData: (val) => {
+      return parseInt(val)
+    },
+  },
+  TRIG0_edge_type: {
+    type: 'number',
+    showName: 'Trigger 0 Type',
+    componentType: 'triggerBlock',
+    range: Object.freeze({ min: 0, max: 2 }), // UI上能輸入的最大最小值
+    defaultValue: 0,
+    defaultUnit: null,
+    downloadUnit: null,
+    unit: {},
+    outputRawData: (val) => {
+      return parseInt(val)
+    },
+    outputReadabilityData: (val) => {
+      return parseInt(val)
+    },
+  },
+  TRIG1_edge_type: {
+    type: 'number',
+    showName: 'Trigger 1 Type',
     componentType: 'triggerBlock',
     range: Object.freeze({ min: 0, max: 2 }), // UI上能輸入的最大最小值
     defaultValue: 0,
@@ -89,17 +224,17 @@ const EliteTrigger = {
     },
   },
   MODE_OPTIONS: [
-    {
-      id: 0,
-      description: 'Analog Current Control (ACC)',
-    },
     {
       id: 1,
       description: 'Idle',
     },
+    {
+      id: 0,
+      description: 'Analog Current Control (ACC)',
+    },
   ],
   MODE: {
-    0: null,
+    0: ACC,
     1: Idle,
   },
 }

src/data/config-table/index.js

@@ -33,14 +33,15 @@ const serialNumberMappingTable = {
     },
     3: {
       1: {
-        0: EliteEDC, // BAT1.0
+        0: EliteEDC, // BAT0.1
+        1: EliteEDC, // BAT1.0
       },
     },
     4: {
       1: {
         0: EliteEIS, // EIS1.0
         1: EliteEIS, // EIS1.1
-        2: EliteEIS, // EIS1.1mini
+        2: EliteEIS, // EIS mini1.0
       },
     },
     5: {

src/store/modules/project/actions/projectAct.js

@@ -50,6 +50,7 @@ const projectActs = {
     const response = await payload.api.project.create(project)
     // align project id with column id
     project.id = response.data.id
+    project.created_at = response.data.created_at
 
     state.projectConfigList.push(project)
   },
@@ -113,9 +114,13 @@ const projectActs = {
     copyProject.uuid = uuidv4()
     // create project need to remove
     delete copyProject.id
+    delete copyProject.created_at
+    delete copyProject.updated_at
 
     const response = await api.project.create(copyProject)
     copyProject.id = response.data.id
+    copyProject.created_at = response.data.created_at
+    copyProject.updated_at = response.data.updated_at
     state.projectList.push(copyProject)
   },
 

src/store/modules/task/content/actions/chartAct.js

@@ -1237,7 +1237,7 @@ function getLegendName (sourceList, formulaID, deviceList) {
           // eslint-disable-next-line no-case-declarations
           channelName = getConfigChannel(device.library_name, device.configuration.MODE, source.channel - 1)
           if (!channelName) break
-          legendName += 'E' + source.id + '-' + channelName.name[0]
+          legendName += 'E' + source.id + '-' + channelName.name.replace('_', '')
           break
         case 'EliteEIS':
           // eslint-disable-next-line no-case-declarations
@@ -1250,7 +1250,7 @@ function getLegendName (sourceList, formulaID, deviceList) {
             legendName += 'E' + source.id + '-' + channelName.name.split('_').join('')
             break
           }
-          legendName += 'E' + source.id + '-' + channelName.name[0]
+          legendName += 'E' + source.id + '-' + channelName.name.replace('_', '')
           break
         default:
           legendName += 'D' + source.id + 'CH' + source.channel