zhaobao há 1 ano atrás
pai
commit
45c9153b01

+ 1 - 1
src/layout/components/Navbar.vue

@@ -149,7 +149,7 @@ export default {
     sideTabChange(index, item) {
       const token = getToken()
       if (item.href) {
-        const bigscreen = process.env.NODE_ENV === 'development' ? 'http://192.168.3.16:8080/#/' : 'http://113.141.93.143:1689/#/'
+        const bigscreen = process.env.NODE_ENV === 'development' ? 'http://192.168.3.16:1890/#/' : 'http://113.141.93.143:1689/#/'
         window.open(`${bigscreen}?token=${token}`)
         return
       }

+ 11 - 0
src/views/goaf/sensor/CameraModel.vue

@@ -14,6 +14,15 @@
       label-position="right"
       label-width="220px"
     >
+      <el-form-item label="安装地点" required>
+        <el-select
+          v-model="formData.transType"
+          placeholder="运输类型"
+        >
+          <el-option :value="0" label="装货" />
+          <el-option :value="1" label="卸货" />
+        </el-select>
+      </el-form-item>
       <el-form-item label="重量评估摄像头IP" required>
         <el-input v-model="formData.transWeightCameraIp" placeholder="请输入摄像头重量评估摄像头IP" style="width:300px" />
       </el-form-item>
@@ -60,6 +69,7 @@ export default {
       dialogVisible: false,
       formData: {
         'ocId': undefined,
+        'transType': 0,
         'transWeightCameraIp': '',
         'transLicenseCameraIp': '',
         'transWeightCameraPort': 80,
@@ -98,6 +108,7 @@ export default {
     resetFormData() {
       this.formData = {
         'ocId': undefined,
+        'transType': 0,
         'transWeightCameraIp': '',
         'transLicenseCameraIp': '',
         'transWeightCameraPort': 80,

+ 6 - 2
src/views/goaf/sensor/camera.vue

@@ -20,6 +20,11 @@
         <el-table-column prop="transWeightCameraPort" label="重量评估摄像头端口" />
         <el-table-column prop="transLicenseCameraIp" label="车牌摄像头IP" />
         <el-table-column prop="transCameraLocation" label="安装位置" />
+        <el-table-column prop="transCameraLocation" label="运输类型">
+          <template v-slot="{row}">
+            {{ row.transType===0?'装货':(row.transType===1?'卸货':'--') }}
+          </template>
+        </el-table-column>
         <el-table-column label="操作" header-align="center" align="center" width="170">
           <template v-slot="{row}">
             <el-button size="mini" type="primary" icon="el-icon-edit" @click="handleUpdate(row)">修改</el-button>
@@ -47,8 +52,7 @@ export default {
       listLoading: false,
       conditions: {
         page: 1,
-        limit: 10,
-        goafDevName: ''
+        limit: 10
       }
     }
   },

+ 1 - 1
vue.config.js

@@ -13,7 +13,7 @@ const name = defaultSettings.title || 'vue Admin Template' // page title
 // For example, Mac: sudo npm run
 // You can change the port by the following methods:
 // port = 9528 npm run dev OR npm run dev --port = 9528
-const port = process.env.port || process.env.npm_config_port || 9528 // dev port
+const port = process.env.port || process.env.npm_config_port || 1889 // dev port
 
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {