fix: 增加地图管理字段

aa2e0e5a · 郑艺斌 · b1a5cdd9 · aa2e0e5a · aa2e0e5a · aa2e0e5a
Commit aa2e0e5a authored Aug 29, 2022 by 郑艺斌
Showing with 52 additions and 23 deletions
.env.development
.env.production
src/store/modules/common.js
src/views/layout/components/TagsView/index.vue
src/views/modules/siteAdmin/mapAdmin/add.vue
src/views/modules/siteAdmin/siteConfig/add.vue
src/views/modules/siteAdmin/siteConfig/index.vue
src/views/modules/siteAdmin/siteTaskType/index.vue
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ ENV = 'development'
 VUE_APP_BASE_API = '/api'
 # Jeeplus快速开发平台/后台地址
-VUE_APP_SERVER_URL = 'http://10.10.10.12:8080/jianlin-tms/'
+VUE_APP_SERVER_URL = 'http://10.10.10.123:8080/jianlin-tms/'
 VUE_APP_SERVER_URL1 = 'http://jltms.meiqicloud.com/api/'
 #单点登录设置

--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@ ENV = 'production'
 #Jeeplus快速开发平台/后台地址
 # 建霖内外地址
-VUE_APP_SERVER_URL1 = 'http://192.168.202.93:3000/api'
+VUE_APP_SERVER_URL = 'http://192.168.202.93:3000/api'
 # 美契公司地址
-VUE_APP_SERVER_URL = 'http://jltms.meiqicloud.com/api'
+VUE_APP_SERVER_URL1 = 'http://jltms.meiqicloud.com/api'
 #单点登录设置
 VUE_APP_SSO_LOGIN  = 'false'

--- a/src/store/modules/common.js
+++ b/src/store/modules/common.js
@@ -16,7 +16,8 @@ export default {
    // 侧边栏类型名
    leftMenuCategory: "",
    // 主入口标签页
-    mainTabs: [{ name: "home", title: "首页", fullPath: "/home" }],
+    // mainTabs: [{ name: "home", title: "首页", fullPath: "/home" }],
+    mainTabs: [],
    mainTabsActiveName: "home",
    // 当前选中的top menu的index
    topMenuActiveIndex: "0",

--- a/src/views/layout/components/TagsView/index.vue
+++ b/src/views/layout/components/TagsView/index.vue
 <template>
  <div id="tags-view-container" class="tags-view-container">
    <scroll-pane ref="scrollPane" class="tags-view-wrapper" @scroll="handleScroll">
-      <router-link
+      <router-link v-for="tag in visitedViews" ref="tag" :key="tag.fullPath" :class="isActive(tag) ? 'active' : ''"
-        v-for="tag in visitedViews"
+        :to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }" tag="span" class="tags-view-item"
-        ref="tag"
+        v-slot="{ navigate }" @contextmenu.prevent.native="openMenu(tag, $event)"
-        :key="tag.fullPath"
+        @click.middle.native="!isAffix(tag) ? closeSelectedTag(tag) : ''">
-        :class="isActive(tag)?'active':''"
-        :to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }"
-        tag="span"
-        class="tags-view-item"
-        v-slot="{ navigate }"
-        @contextmenu.prevent.native="openMenu(tag,$event)"
-        @click.middle.native="!isAffix(tag)?closeSelectedTag(tag):''"
-      >
        <span @click="navigate" @keypress.enter="navigate">
-          {{tag.query&&tag.query.title || tag.title }}
+          {{ tag.query && tag.query.title || tag.title }}
          <span v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
        </span>
      </router-link>
    </scroll-pane>
-    <ul v-show="visible" :style="{left:left+'px',top:top -60 +'px'}" class="contextmenu">
+    <ul v-show="visible" :style="{ left: left + 'px', top: top - 60 + 'px' }" class="contextmenu">
      <li @click="refreshSelectedTag(selectedTag)">刷新</li>
      <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)">关闭</li>
      <li @click="closeOthersTags">关闭其它</li>
@@ -66,7 +57,7 @@ export default {
    }
  },
  mounted () {
-    this.initTags()
+    // this.initTags()
    this.addTags()
  },
  methods: {

--- a/src/views/modules/siteAdmin/mapAdmin/add.vue
+++ b/src/views/modules/siteAdmin/mapAdmin/add.vue
@@ -8,6 +8,9 @@
      <el-form-item label="地图ID" prop="thirdId">
        <el-input v-model="formData.thirdId" placeholder="地图ID"></el-input>
      </el-form-item>
+      <el-form-item label="区域ID" prop="areaId">
+        <el-input v-model="formData.areaId" placeholder="区域ID"></el-input>
+      </el-form-item>
      <el-form-item label="备注：">
        <el-input type="textarea" v-model="formData.remark" :rows="3"></el-input>
      </el-form-item>
@@ -68,6 +71,9 @@ export default {
        thirdId: [
          { required: true, message: '请输入地图ID', trigger: 'blur' },
        ],
+        areaId: [
+          { required: true, message: '请输入区域ID', trigger: 'blur' },
+        ],
        sort: [
          { required: true, message: '请输入排序', trigger: 'blur' },
        ]

--- a/src/views/modules/siteAdmin/siteConfig/add.vue
+++ b/src/views/modules/siteAdmin/siteConfig/add.vue
@@ -85,7 +85,6 @@
                  </el-option>
                </el-select>
              </el-form-item>
            </template>
          </vxe-column>
          <vxe-column width="80px" v-if="formData.tempId && formData.tempId !== ''">
@@ -101,6 +100,27 @@
              </el-cascader>
            </template>
          </vxe-column>
+          <!-- <vxe-column width="80px">
+            <template #default="{ row }">
+              <span v-if="row.equipmentType === '1' || row.equipmentType === '2'">车辆分组</span>
+            </template>
+          </vxe-column>
+          <vxe-column>
+            <template #default="{ row, $rowIndex }">
+              <el-form-item v-if="row.equipmentType === '1' || row.equipmentType === '2'">
+                <el-select v-model="row.mirCarGroup" v-if="row.equipmentType === '1'">
+                  <el-option v-for="item in $dictUtils.getDictList('tms_mir_car_group')" :key="item.value"
+                    :label="item.label" :value="item.value">
+                  </el-option>
+                </el-select>
+                <el-select v-model="row.lxCarGroup" v-else-if="row.equipmentType === '2'">
+                  <el-option v-for="item in $dictUtils.getDictList('tms_lx_car_group')" :key="item.value"
+                    :label="item.label" :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </template>
+          </vxe-column> -->
          <vxe-column width="90px">
            <template #default="{ row, rowIndex }">
              <el-button type="danger" @click="removeRow(rowIndex)">删 除</el-button>

--- a/src/views/modules/siteAdmin/siteConfig/index.vue
+++ b/src/views/modules/siteAdmin/siteConfig/index.vue
@@ -82,6 +82,7 @@
                  class="pointStatus el-icon-refresh" @click="changePointStatus(scope.row)"></i></span>
            </template>
          </vxe-column>
+          <!-- <vxe-column field="equipmentGroup" title="设备分组" align="center" width="130px"></vxe-column> -->
          <vxe-column field="remark" title="备注" align="center" width="130px"></vxe-column>
          <vxe-column field="status" title="状态" align="center" width="130px">
            <template slot-scope="scope">
@@ -134,7 +135,13 @@ export default {
  data () {
    return {
      searchForm: {
-        sort: '0'
+        company: '',
+        factoryId: '',
+        siteType: '',
+        name: '',
+        command: '',
+        tempId: '',
+        status: ''
      },
      tablePage: {
        total: 0,
@@ -243,7 +250,10 @@ export default {
        size: this.tablePage.pageSize
      }
      this.SiteConfig.getConfigPage(can).then(({ data }) => {
-        this.tableData = data.records
+        this.tableData = data.records?.map(item => {
+          item.equipmentGroup = item.equipmentType == "1" ? item.mirCarGroup_dictText : item.lxCarGroup_dictText
+          return item
+        })
        this.tablePage.total = data.total
        this.loading = false
      })

--- a/src/views/modules/siteAdmin/siteTaskType/index.vue
+++ b/src/views/modules/siteAdmin/siteTaskType/index.vue
@@ -86,6 +86,7 @@ export default {
  data () {
    return {
      searchForm: {
+        company: '',
        typeName: '',
        status: '-1',
      },