diff --git a/public/js/config.js b/public/js/config.js
index 8f6553e2..c2af2faa 100644
--- a/public/js/config.js
+++ b/public/js/config.js
@@ -1,4 +1,4 @@
-var COMPANY = ''; //通用
+// var COMPANY = ''; //通用
 // var COMPANY='zhongjian'; //中建，和沃尔对接的插件版用这个企业
 // var COMPANY='hezhan'; //合展-宿迁
 // var COMPANY='nanchang'; //南昌地铁、衢州
@@ -9,6 +9,7 @@ var COMPANY = ''; //通用
 // COMPANY = 'xingxuan'
 // COMPANY = 'hengtong'//瑞士恒通
 // COMPANY = 'yunlian'//云联万物
+COMPANY = 'neimenggu'//内蒙古项目
 
 
 
@@ -21,7 +22,7 @@ var PROJECT = {
 }
 
 
-var PROJECT_TYPE = PROJECT.online_zjsj
+var PROJECT_TYPE = PROJECT.local_test
 
 var headerShow = true; // 是否显示头部
 var tabsShow = true;  // 是否显示tabs
diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index 4bb2a837..6a89d612 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -80,9 +80,9 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL = 'http://192.168.34.221:12346' //郭圣雄本地
   // axios.defaults.baseURL = 'http://192.168.34.221:12350' //金林湾本地
   // axios.defaults.baseURL = 'http://192.168.34.122:8070' //彭洁本地
-  axios.defaults.baseURL = 'http://192.168.34.221:8070' //郭圣雄本地
+  // axios.defaults.baseURL = 'http://192.168.34.221:8070' //郭圣雄本地
   // axios.defaults.baseURL = 'http://101.43.164.214:11111' //百色线上
-  // axios.defaults.baseURL = 'http://101.43.164.214:12345/#/'//内蒙古线上
+  axios.defaults.baseURL = 'http://101.43.164.214:12345/'//内蒙古线上
   // axios.defaults.baseURL = 'http://121.196.214.246/api/'//金林湾线上新
 
 } else if (process.env.NODE_ENV == 'debug') {
diff --git a/src/store/index.js b/src/store/index.js
index 8c215d82..25d42a8c 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -89,6 +89,8 @@ export default new Vuex.Store({
     // FILEURL: 'http://182.90.224.147:100/image/',//演示平台
     // UPLOADURL: 'http://116.169.63.183:7070/upload/image',//三江集团
     // FILEURL: 'http://116.169.63.183:7070/image/',//三江集团
+    // UPLOADURL: 'http://101.43.164.214:12345/upload/image',//内蒙古
+    // FILEURL: 'http://101.43.164.214:12345/image/',//内蒙古
 
     ACCOUNTTYPE: [
       "系统管理员",
@@ -277,8 +279,8 @@ export default new Vuex.Store({
       state.fileList.operaColumnExpand !== null
         ? Number(state.fileList.operaColumnExpand)
         : document.body.clientWidth > 1280
-        ? 1
-        : 0, //  操作列是否展开，0不展开，1展开
+          ? 1
+          : 0, //  操作列是否展开，0不展开，1展开
     selectedColumnList: (state) =>
       state.fileList.selectedColumnList === null
         ? ["extendName", "fileSize", "uploadTime", "deleteTime"]
diff --git a/src/views/projectAdmin/jlw/BIM/BimCoordination.vue b/src/views/projectAdmin/jlw/BIM/BimCoordination.vue
index c430a6dc..12d4b1ed 100644
--- a/src/views/projectAdmin/jlw/BIM/BimCoordination.vue
+++ b/src/views/projectAdmin/jlw/BIM/BimCoordination.vue
@@ -25,7 +25,7 @@ export default {
   },
   data() {
     // return { modelReport }
-    const list = new Array(6).fill(0).map((item, index) => new Array(3).fill(0).map(() => (index === 3 ? 0 : 1)))
+    const list = new Array(6).fill(0).map((item, index) => new Array(3).fill(0).map(() => (index === 3 ? 1 : 1)))
     return {
       list
     }
diff --git a/src/views/projectFront/carManage/carManage.vue b/src/views/projectFront/carManage/carManage.vue
index 95d7616d..a1136e46 100644
--- a/src/views/projectFront/carManage/carManage.vue
+++ b/src/views/projectFront/carManage/carManage.vue
@@ -1,499 +1,633 @@
 <template>
-    <div class="fullHeight">
-        <div class="searchBox whiteBlock">
-            <el-form
-                :inline="true"
-                class="demo-form-inline"
-                size="medium"
+  <div class="fullHeight">
+    <div class="searchBox whiteBlock">
+      <el-form :inline="true" class="demo-form-inline" size="medium">
+        <el-form-item :label="$t('message.carManage.carNumber')">
+          <el-input
+            v-model="carNumber"
+            :placeholder="$t('message.deviceManage.placeholder')"
+          ></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('message.carManage.isBlack')">
+          <el-select
+            v-model="isBlack"
+            :placeholder="$t('message.carManage.placeholder_select')"
+            clearable
+          >
+            <el-option
+              v-for="(item, index) in $t('message.carManage.isBlackArr')"
+              :key="item.value"
+              :label="item"
+              :value="index"
             >
-                <el-form-item :label="$t('message.carManage.carNumber')">
-                    <el-input v-model="carNumber" :placeholder="$t('message.deviceManage.placeholder')"></el-input>
-                </el-form-item>
-                <el-form-item :label="$t('message.carManage.isBlack')">
-                    <el-select v-model="isBlack" :placeholder="$t('message.carManage.placeholder_select')" clearable>
-                        <el-option
-                            v-for="(item,index) in $t('message.carManage.isBlackArr')"
-                            :key="item.value"
-                            :label="item"
-                            :value="index">
-                        </el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" plain @click="getList">{{$t('message.deviceManage.query')}}</el-button>
-                </el-form-item>
-            </el-form>
-            <el-button type="warning" size="medium" plain @click="refresh">{{$t('message.deviceManage.refresh')}}</el-button>
-            <el-button type="primary" size="medium" @click="add">{{$t('message.deviceManage.add')}}</el-button>
-        </div>
-        <div class="table_wrap whiteBlock">
-        <el-table class="tables" :data="List">
-            <el-table-column prop="carNumber" align="center" :label="$t('message.carManage.carNumber')"
-            ></el-table-column>
-            <el-table-column prop="carColor" :label="$t('message.carManage.carColor')" align="center"></el-table-column>
-            <el-table-column prop="carTypeName" :label="$t('message.carManage.carType')" align="center">
-            </el-table-column>
-            <el-table-column prop="driverWorkerName" :label="$t('message.carManage.driverName')" align="center"></el-table-column>
-            <el-table-column prop="driverTelephone" :label="$t('message.carManage.driverTelephone')" align="center"></el-table-column>
-            <el-table-column prop="isBlack" :label="$t('message.carManage.isBlack')" align="center">
-                <template slot-scope="scope">{{$t('message.carManage.isBlackArr')[scope.row.isBlack]}}</template>
-            </el-table-column>
-            <el-table-column width="80" align="center" :label="$t('message.carManage.carPhotosUrl')">
-                <div slot slot-scope="scope">
-                    <img v-if="scope.row.carPhotosUrl && JSON.parse(scope.row.carPhotosUrl).length>0" :preview="JSON.parse(scope.row.carPhotosUrl)[0]?$store.state.FILEURL+JSON.parse(scope.row.carPhotosUrl)[0].url:''"
-                         :src="JSON.parse(scope.row.carPhotosUrl)[0]?$store.state.FILEURL+JSON.parse(scope.row.carPhotosUrl)[0].url:''"
-                         alt="" width="50px" height="50px">
-                </div>
-            </el-table-column>
-            <el-table-column :label="$t('message.deviceManage.operation')" align="center">
-                <template slot-scope="scope">
-                    <div class="tableBtns">
-                        <!--<div @click="yu(scope.row)" class="operationText"><img src="@/assets/images/yu.png" alt="">{{$t('message.alarmValueSet.yjz')}}
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" plain @click="getList">{{
+            $t('message.deviceManage.query')
+          }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-button type="warning" size="medium" plain @click="refresh">{{
+        $t('message.deviceManage.refresh')
+      }}</el-button>
+      <el-button type="primary" size="medium" @click="add">{{
+        $t('message.deviceManage.add')
+      }}</el-button>
+    </div>
+    <div class="table_wrap whiteBlock">
+      <el-table class="tables" :data="List">
+        <el-table-column
+          prop="carNumber"
+          align="center"
+          :label="$t('message.carManage.carNumber')"
+        ></el-table-column>
+        <el-table-column
+        v-if="COMPANY != 'neimenggu'"
+          prop="carColor"
+          :label="$t('message.carManage.carColor')"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="carTypeName"
+          :label="$t('message.carManage.carType')"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="driverName"
+          :label="$t('message.carManage.driverName')"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="driverTelephone"
+          :label="$t('message.carManage.driverTelephone')"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="isBlack"
+          :label="$t('message.carManage.isBlack')"
+          align="center"
+        >
+          <template slot-scope="scope">{{
+            $t('message.carManage.isBlackArr')[scope.row.isBlack]
+          }}</template>
+        </el-table-column>
+        <el-table-column
+          width="80"
+          align="center"
+          :label="$t('message.carManage.carPhotosUrl')"
+        >
+          <div slot slot-scope="scope">
+            <img
+              v-if="
+                scope.row.carPhotosUrl &&
+                JSON.parse(scope.row.carPhotosUrl).length > 0
+              "
+              :preview="
+                JSON.parse(scope.row.carPhotosUrl)[0]
+                  ? $store.state.FILEURL +
+                    JSON.parse(scope.row.carPhotosUrl)[0].url
+                  : ''
+              "
+              :src="
+                JSON.parse(scope.row.carPhotosUrl)[0]
+                  ? $store.state.FILEURL +
+                    JSON.parse(scope.row.carPhotosUrl)[0].url
+                  : ''
+              "
+              alt=""
+              width="50px"
+              height="50px"
+            />
+          </div>
+        </el-table-column>
+        <el-table-column
+          :label="$t('message.deviceManage.operation')"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <div class="tableBtns">
+              <!--<div @click="yu(scope.row)" class="operationText"><img src="@/assets/images/yu.png" alt="">{{$t('message.alarmValueSet.yjz')}}
                         </div>
                         <div @click="bao(scope.row)" class="operationText"><img src="@/assets/images/bao.png" alt="">{{$t('message.alarmValueSet.bjz')}}
                         </div>-->
-                        <div @click="edit(scope.row)" class="operationText">
-                            <img src="@/assets/images/icon-edit.png" width="15px" height="15px"/>
-                            <span>{{$t('message.deviceManage.edit')}}</span>
-                        </div>
-                        <div @click="deleteDev(scope.row)" class="operationText">
-                            <img src="@/assets/images/icon-delete.png" width="15px" height="15px"/>
-                            <span>{{$t('message.deviceManage.delete')}}</span>
-                        </div>
-                    </div>
-                </template>
-            </el-table-column>
-        </el-table>
-        <el-pagination
-                class="pagerBox"
-                @size-change="SizeChange"
-                @current-change="CurrentChange"
-                :current-page="pagInfo.pageNo"
-                :page-sizes="$store.state.PAGESIZRS"
-                :page-size="pagInfo.pageSize"
-                layout="total, sizes, prev, pager, next"
-                :total="Number(pagInfo.total)"
-                background
-        ></el-pagination>
-        </div>
-        <el-dialog :modal-append-to-body="false" @close="close" :title="$t('message.carManage.Popup_title')[Popup.type]"
-                   :visible.sync="Popup.show"
-                   width="667px">
-            <div class="dialog_content">
-                <el-form v-show="Popup.type === 'add'||Popup.type === 'edit'" size="medium"
-                         ref="addEditForm" :model="addEditForm" :rules="addEditRules"
-                         label-width="120px" class="dialogFormBox">
-                    <el-form-item :label="$t('message.carManage.carNumber')" prop="carNumber">
-                        <el-input v-model="addEditForm.carNumber"
-                                  :placeholder="$t('message.deviceManage.placeholder')"></el-input>
-                    </el-form-item>
-                    <el-form-item :label="$t('message.carManage.carPhotosUrl')" prop="carPhotosUrl">
-                        <el-upload
-                                :action="$store.state.UPLOADURL"
-                                list-type="picture-card"
-                                multiple
-                                name="files"
-                                :limit="1"
-                                :file-list="fileList"
-                                :on-success="handleSuccess"
-                                :on-remove="handleRemove">
-                            <i class="el-icon-plus"></i>
-                        </el-upload><!--:on-preview="handlePictureCardPreview"-->
-                        <!--                        {{showImgUrl}}-->
-                    </el-form-item>
-                    <el-form-item :label="$t('message.carManage.carColor')" prop="carColor">
-                        <el-select v-model="addEditForm.carColor"
-                                   :placeholder="$t('message.carManage.placeholder_select')">
-                            <el-option
-                                    v-for="item in $t('message.carManage.carColorArr')"
-                                    :key="item.value"
-                                    :label="item"
-                                    :value="item">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item :label="$t('message.carManage.carType')" prop="carType">
-                        <el-select v-model="addEditForm.carType"
-                                   :placeholder="$t('message.carManage.placeholder_select')">
-                            <el-option
-                                    v-for="(item,index) in carTypeList"
-                                    :key="index"
-                                    :label="item.carTypeName"
-                                    :value="item.id">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <!-- 司机姓名 -->
-                    <el-form-item :label="$t('message.carManage.driverName')" prop="driverWorkerId">
-                        <!-- <el-input v-model="addEditForm.driverName"
+              <div @click="edit(scope.row)" class="operationText">
+                <img
+                  src="@/assets/images/icon-edit.png"
+                  width="15px"
+                  height="15px"
+                />
+                <span>{{ $t('message.deviceManage.edit') }}</span>
+              </div>
+              <div @click="deleteDev(scope.row)" class="operationText">
+                <img
+                  src="@/assets/images/icon-delete.png"
+                  width="15px"
+                  height="15px"
+                />
+                <span>{{ $t('message.deviceManage.delete') }}</span>
+              </div>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        class="pagerBox"
+        @size-change="SizeChange"
+        @current-change="CurrentChange"
+        :current-page="pagInfo.pageNo"
+        :page-sizes="$store.state.PAGESIZRS"
+        :page-size="pagInfo.pageSize"
+        layout="total, sizes, prev, pager, next"
+        :total="Number(pagInfo.total)"
+        background
+      ></el-pagination>
+    </div>
+    <el-dialog
+      :modal-append-to-body="false"
+      @close="close"
+      :title="$t('message.carManage.Popup_title')[Popup.type]"
+      :visible.sync="Popup.show"
+      width="667px"
+    >
+      <div class="dialog_content">
+        <el-form
+          v-show="Popup.type === 'add' || Popup.type === 'edit'"
+          size="medium"
+          ref="addEditForm"
+          :model="addEditForm"
+          :rules="addEditRules"
+          label-width="120px"
+          class="dialogFormBox"
+        >
+          <el-form-item
+            :label="$t('message.carManage.carNumber')"
+            prop="carNumber"
+          >
+            <el-input
+              v-model="addEditForm.carNumber"
+              :placeholder="$t('message.deviceManage.placeholder')"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            :label="$t('message.carManage.carPhotosUrl')"
+            prop="carPhotosUrl"
+          >
+            <el-upload
+              :action="$store.state.UPLOADURL"
+              list-type="picture-card"
+              multiple
+              name="files"
+              :limit="1"
+              :file-list="fileList"
+              :on-success="handleSuccess"
+              :on-remove="handleRemove"
+            >
+              <i class="el-icon-plus"></i> </el-upload
+            ><!--:on-preview="handlePictureCardPreview"-->
+            <!--                        {{showImgUrl}}-->
+          </el-form-item>
+          <el-form-item
+            :label="$t('message.carManage.carColor')"
+            prop="carColor"
+            v-if="COMPANY != 'neimenggu'"
+          >
+            <el-select
+              v-model="addEditForm.carColor"
+              :placeholder="$t('message.carManage.placeholder_select')"
+            >
+              <el-option
+                v-for="item in $t('message.carManage.carColorArr')"
+                :key="item.value"
+                :label="item"
+                :value="item"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item :label="$t('message.carManage.carType')" prop="carType">
+            <el-select
+              v-model="addEditForm.carType"
+              :placeholder="$t('message.carManage.placeholder_select')"
+            >
+              <el-option
+                v-for="(item, index) in carTypeList"
+                :key="index"
+                :label="item.carTypeName"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <!-- 司机姓名 -->
+          <el-form-item
+            :label="$t('message.carManage.driverName')"
+            prop="driverName"
+            v-if="COMPANY == 'neimenggu'"
+          >
+            <el-input
+              v-model="addEditForm.driverName"
+              :placeholder="$t('message.deviceManage.placeholder')"
+            ></el-input>
+          </el-form-item>
+          <!-- 司机姓名 -->
+          <el-form-item
+            :label="$t('message.carManage.driverName')"
+            prop="driverWorkerId"
+            v-else
+          >
+            <!-- <el-input v-model="addEditForm.driverName"
                                   :placeholder="$t('message.deviceManage.placeholder')"></el-input> -->
-                        <el-select v-model="addEditForm.driverWorkerId"
-                                   filterable multiple
-                                   collapse-tags
-                                   :placeholder="$t('message.deviceManage.placeholder_select')" @change="changeDriverFn">
-                            <el-option
-                                    v-for="item in appWorkerList"
-                                    :key="item.id"
-                                    :label="item.workerName"
-                                    :value="item.id">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <!-- 司机电话 -->
-                    <el-form-item label="司机电话" prop="driverTelephone">
-                        <el-input v-model="addEditForm.driverTelephone" placeholder="请输入"></el-input>
-                    </el-form-item>
+            <el-select
+              v-model="addEditForm.driverWorkerId"
+              filterable
+              multiple
+              collapse-tags
+              :placeholder="$t('message.deviceManage.placeholder_select')"
+              @change="changeDriverFn"
+            >
+              <el-option
+                v-for="item in appWorkerList"
+                :key="item.id"
+                :label="item.workerName"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <!-- 司机电话 -->
+          <el-form-item label="司机电话" prop="driverTelephone">
+            <el-input
+              v-model="addEditForm.driverTelephone"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
 
-                    <!-- <el-form-item :label="$t('message.carManage.driverTelephone')" prop="driverTelephone">
+          <!-- <el-form-item :label="$t('message.carManage.driverTelephone')" prop="driverTelephone">
                         <el-input v-model="addEditForm.driverTelephone"
                                   :placeholder="$t('message.deviceManage.placeholder')"></el-input>
                     </el-form-item> -->
-                    <!-- <el-form-item :label="'身份证号码'" prop="idCard">
+          <!-- <el-form-item :label="'身份证号码'" prop="idCard">
                         <el-input v-model="addEditForm.idCard"
                                   :placeholder="$t('message.deviceManage.placeholder')"></el-input>
                     </el-form-item> -->
-                    <!-- 是否黑名单 -->
-                    <el-form-item :label="$t('message.carManage.isBlack')" prop="isBlack">
-                        <el-radio-group v-model="addEditForm.isBlack">
-                            <el-radio v-for="(i,index) in $t('message.carManage.isBlackArr')" :key="i.value"
-                                      :label="index">{{i}}
-                            </el-radio>
-                        </el-radio-group>
-                    </el-form-item>
-                    <el-form-item :label="$t('message.deviceManage.alarmPushWorkerId')">
-                        <el-select v-model="addEditForm.alarmPushWorkerId"
-                                   multiple
-                                   collapse-tags
-                                   :placeholder="$t('message.deviceManage.placeholder_select')">
-                            <el-option v-if="item.workerId!=''"
-                                    v-for="item in options"
-                                    :key="item.workerId"
-                                    :label="item.workerName"
-                                    :value="item.workerId">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <div class="dialog-footer">
-                        <el-button
-                                class="cancleBtn"
-                                @click="Popup.show = false"
-                                icon="el-icon-circle-close"
-                                size="medium"
-                        >{{$t('message.deviceManage.cancel')}}
-                        </el-button>
-                        <el-button
-                                type="primary"
-                                icon="el-icon-circle-check"
-                                @click="submit"
-                                size="medium"
-                        >{{$t('message.deviceManage.save')}}
-                        </el-button>
-                    </div>
-                </el-form>
-            </div>
-        </el-dialog>
-        <!--        <img :preview="showImgUrl" :src="showImgUrl" alt="">-->
-    </div>
+          <!-- 是否黑名单 -->
+          <el-form-item :label="$t('message.carManage.isBlack')" prop="isBlack">
+            <el-radio-group v-model="addEditForm.isBlack">
+              <el-radio
+                v-for="(i, index) in $t('message.carManage.isBlackArr')"
+                :key="i.value"
+                :label="index"
+                >{{ i }}
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item :label="$t('message.deviceManage.alarmPushWorkerId')">
+            <el-select
+              v-model="addEditForm.alarmPushWorkerId"
+              multiple
+              collapse-tags
+              :placeholder="$t('message.deviceManage.placeholder_select')"
+            >
+              <el-option
+                v-if="item.workerId != ''"
+                v-for="item in options"
+                :key="item.workerId"
+                :label="item.workerName"
+                :value="item.workerId"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <div class="dialog-footer">
+            <el-button
+              class="cancleBtn"
+              @click="Popup.show = false"
+              icon="el-icon-circle-close"
+              size="medium"
+              >{{ $t('message.deviceManage.cancel') }}
+            </el-button>
+            <el-button
+              type="primary"
+              icon="el-icon-circle-check"
+              @click="submit"
+              size="medium"
+              >{{ $t('message.deviceManage.save') }}
+            </el-button>
+          </div>
+        </el-form>
+      </div>
+    </el-dialog>
+    <!--        <img :preview="showImgUrl" :src="showImgUrl" alt="">-->
+  </div>
 </template>
 <script>
-    import {
-        addCarInfoApi,
-        editCarInfoApi,
-        deleteCarInfoApi,
-        getCarInfoListApi,getcarTypeListApi
-    } from '../../../assets/js/api/carManage'
-    import {
-    getProjectChilderSystemUserListApi
-    } from "@/assets/js/api/configManage";
-     import {
-    selectAppWorkerListApi
-    } from "@/assets/js/api/laborPerson";
-    export default {
-        mounted() {
-            this.getWorkerList()
-            this.getList();
-            this.getLaborManagementList()
-            this.getAppWorkerList()
-        },
-        data() {
-            return {
-                fileList: [],
-                showImgUrl: '',
-                props: {
-                    multiple: true
-                },
-                addEditRules: {
-                    carColor: [
-                        {required: true, message: this.$t('message.carManage.required'), trigger: "blur"},
-                        {required: true, message: this.$t('message.carManage.required'), trigger: "change"}
-                    ],
-                    carNumber: [
-                        {required: true, message: this.$t('message.carManage.required'), trigger: "blur"},
-                        {required: true, message: this.$t('message.carManage.required'), trigger: "change"}
-                    ],
-                    carType: [
-                        {required: true, message: this.$t('message.carManage.required'), trigger: "blur"},
-                        {required: true, message: this.$t('message.carManage.required'), trigger: "change"}
-                    ],
-                    driverTelephone: [
-                        {required: true, message: this.$t('message.carManage.required'), trigger: "blur"},
-                        {required: true, message: this.$t('message.carManage.required'), trigger: "change"}
-                    ],
-                    isBlack: [
-                        {required: true, message: this.$t('message.carManage.required'), trigger: "blur"},
-                        {required: true, message: this.$t('message.carManage.required'), trigger: "change"}
-                    ],
-                    driverWorkerId:[
-                        {required: true, message: this.$t('message.carManage.required'), trigger: "blur"},
-                        // {required: true, message: this.$t('message.carManage.required'), trigger: "change"}
-                    ],
-                    driverTelephone:[
-                        {required: true, message: this.$t('message.carManage.required'), trigger: "blur"},
-                        {required: true, message: this.$t('message.carManage.required'), trigger: "change"}
-                    ],
-                },
-                options: [
-                    /*{realName: "曾祥万", value: 1},
-                    {realName: "李先生", value: 2},*/
-                ],
-                addEditForm: {},
-                pagInfo: {
-                    pageNo: 1,//页数
-                    pageSize: 10,//条数
-                    total: 0,//总条数
-                },
-                List: [
-                    /*{
-                        deviceId: "124578",
-                        deviceName: "扬尘监测1",
-                        isClosed: 2,
-                        address: "22",
-                        createTime: "2019-05-05 16:55:46",
-                    }*/
-                ],
-                Popup: {
-                    type: 'add',
-                    show: false
-                },
-                carTypeList:[],
-                carNumber:'',
-                isBlack: '',
-                appWorkerList:[]
-            }
-        },
-        methods: {
-            changeDriverFn(){
-                // let arr1=[],arr2=[]
-                // for (let index = 0; index < this.appWorkerList.length; index++) {
-                //     const element = this.appWorkerList[index];
-                //     if(this.addEditForm.driverWorkerId.indexOf(element.id)){
-                //         arr1.push(element.phoneNumber)
-                //         arr2.push(element.idCard)
-                //     }
-                // }
-                // console.log(arr1)
-                // this.addEditForm.driverTelephone=arr1.join(',')
-                // this.addEditForm.driverTelephone=arr2.join(',')
-            },
-            handle(type, show) {//打开弹窗前的统一处理
-                this.Popup = {
-                    type: type,
-                    show: show
-                }
-            },
-            add() {
-                this.handle('add', true);
-            },
-            edit(obj) {
-                this.addEditForm = JSON.parse(JSON.stringify(obj));
-                this.fileList = obj.carPhotosUrl;
-                if (typeof obj.carPhotosUrl === 'string') {
-                    this.addEditForm.carPhotosUrl = JSON.parse(obj.carPhotosUrl);
-                    this.fileList = this.addEditForm.carPhotosUrl;
-                    this.fileList.map((file) => {
-                        console.log('url', file.url);
-                        file.url = this.$store.state.FILEURL + file.url;
-                    });
-                }
-                if (typeof obj.alarmPushWorkerId === 'string' && obj.alarmPushWorkerId != '') {
-                    this.addEditForm.alarmPushWorkerId = obj.alarmPushWorkerId.split(',').map(String);
-                }
-                if (typeof obj.driverWorkerId === 'string' && obj.driverWorkerId != '') {
-                    this.addEditForm.driverWorkerId = obj.driverWorkerId.split(',').map(String);
-                }
-                // this.$forceUpdate();
-                console.log('编辑', obj, 'fileList', this.fileList);
-                this.handle('edit', true);
-            },
-            deleteDev(obj) {
-                console.log('删除', obj);
-                this.$confirm(this.$t('message.personnelPosition.beaconManage.table.confirmText') + "【" + obj.carNumber + "】?", this.$t('message.personnelPosition.beaconManage.table.Tips'), {
-                    confirmButtonText: this.$t('message.personnelPosition.confirmButtonText'),
-                    cancelButtonText: this.$t('message.personnelPosition.cancelButtonText'),
-                    type: "warning",
-                }).then(() => {
-                    deleteCarInfoApi({id: obj.id}).then(result => {
-                        if (result.success) {
-                            this.$message.success(result.message);
-                            this.getList();
-                        }
-                    })
-                }).catch(() => {
-                });
-            },
-            submit() {
-                this.processTheFile();
-                let params = JSON.parse(JSON.stringify(this.addEditForm));
-                var arr = [],arr2=JSON.parse(params.carPhotosUrl)
-                if(arr2.length>0){
-                    arr2.forEach(element => {
-                        var item=element
-                        if(element.url.indexOf('http://')!=-1){
-                            item.url=element.url.split('/image/')[1]
-                        }
-                        arr.push(item)
-                    });
-                }
-                params.carPhotosUrl=JSON.stringify(arr)
-                params.projectSn = this.$store.state.projectSn;
-                if(this.addEditForm.alarmPushWorkerId){
-                    params.alarmPushWorkerId = this.addEditForm.alarmPushWorkerId.join(',');
-                }
-                if(this.addEditForm.driverWorkerId){
-                    params.driverWorkerId = this.addEditForm.driverWorkerId.join(',');
-                }
-                this.$refs.addEditForm.validate((valid) => {
-                    if (valid) {
-                        if (this.Popup.type === 'add') {
-                            addCarInfoApi(params).then(result => {
-                                if (result.success) {
-                                    this.$message.success(result.message);
-                                    this.getList();
-                                }
-                            })
-                        } else if (this.Popup.type === 'edit') {
-                            // this.processTheFile();
-                            console.log('编辑信息', this.addEditForm)
-                            editCarInfoApi(params).then(result => {
-                                if (result.success) {
-                                    this.$message.success(result.message);
-                                    this.getList();
-                                }
-                            })
-                        }
-                        this.Popup.show = false;
-                    } else {
-                        return false;
-                    }
-                });
-            },
-            refresh() {
-                this.carNumber=''
-                this.isBlack=''
-                this.pagInfo.pageNo = 1;//页数
-                this.pagInfo.pageSize = 10;//条数
-                this.getList();
-            },
-            getList() {
-                getCarInfoListApi({
-                    pageNo: this.pagInfo.pageNo,
-                    pageSize: this.pagInfo.pageSize,
-                    projectSn: this.$store.state.projectSn,
-                    carNumber:this.carNumber,
-                    isBlack:this.isBlack
-                }).then(result => {
-                    if (result.success) {
-                        this.List = result.result.records;
-                        this.pagInfo.total = result.result.total;
-                        console.log('列表', result);
-                        setTimeout(() => {
-                            this.$previewRefresh();
-                        }, 100);
-                    }
-                })
-            },
-            close() {
-                this.addEditForm = {};
-                this.fileList = [];
-                this.$nextTick(() => {
-                    this.$refs.addEditForm.clearValidate();
-                })
-            },
-            processTheFile() {//处理el上传的文件格式(结构)
-                this.addEditForm.carPhotosUrl = [];
-                this.fileList.map(item => {
-                    if (!item.response) {
-                        this.addEditForm.carPhotosUrl.push(item);
-                        // console.log('符合的结构', item)
-                    } else if (item.response) {
-                        // console.log('不符合的结构', item)
-                        this.addEditForm.carPhotosUrl.push({
-                            name: item.response.data[0].filename,
-                            url: item.response.data[0].imageUrl
-                        });
-                    }
-                })
-                console.log('处理el上传的结构后', this.addEditForm.carPhotosUrl);
-                this.addEditForm.carPhotosUrl = JSON.stringify(this.addEditForm.carPhotosUrl);
-                console.log('转字符串后', this.addEditForm.carPhotosUrl);
-                // console.log('处理el上传的结构后转字符串', JSON.stringify(this.registerInfo.licenseFile));
-                // console.log('最终要上传的图片', this.registerInfo.licenseFile)
-            },
-            handlePictureCardPreview() {
-                this.showImgUrl = this.addEditForm.carPhotosUrl[0].url;
-                // this.showImgUrl = this.$store.state.FILEURL + this.addEditForm.carPhotosUrl[0].url;
-                console.log('handlePictureCardPreview', this.showImgUrl);
-            },
-            handleSuccess(response, file, fileList) {
-                console.log('图片上传成功', fileList);
-                this.fileList = fileList;
-            },
-            handleRemove(response, fileList) {
-                this.fileList = fileList;
-            },
-            SizeChange(val) {
-                this.pagInfo.pageSize = val;
-                this.getList();
-            },
-            CurrentChange(val) {
-                this.pagInfo.pageNo = val;
-                this.getList();
-            },
-            getWorkerList() {
-                getcarTypeListApi({projectSn: this.$store.state.projectSn}).then(result => {
-                    this.carTypeList = result.result;
-                })
-            },
-            getLaborManagementList() {
-                getProjectChilderSystemUserListApi({projectSn: this.$store.state.projectSn}).then(result => {
-                    this.options = result.result;
-                })
-            },
-             getAppWorkerList() {
-                selectAppWorkerListApi({projectSn: this.$store.state.projectSn,personType:1,inserviceType:1}).then(result => {
-                    console.log('查询司机信息的数组',result)
-                    this.appWorkerList = result.result;
-                })
-            },
-        }
+import {
+  addCarInfoApi,
+  editCarInfoApi,
+  deleteCarInfoApi,
+  getCarInfoListApi, getcarTypeListApi
+} from '../../../assets/js/api/carManage'
+import {
+  getProjectChilderSystemUserListApi
+} from "@/assets/js/api/configManage";
+import {
+  selectAppWorkerListApi
+} from "@/assets/js/api/laborPerson";
+export default {
+  mounted() {
+    this.getWorkerList()
+    this.getList();
+    this.getLaborManagementList()
+    this.getAppWorkerList()
+  },
+  data() {
+    return {
+      COMPANY: COMPANY,
+      fileList: [],
+      showImgUrl: '',
+      props: {
+        multiple: true
+      },
+      addEditRules: {
+        carColor: [
+          { required: true, message: this.$t('message.carManage.required'), trigger: "blur" },
+          { required: true, message: this.$t('message.carManage.required'), trigger: "change" }
+        ],
+        carNumber: [
+          { required: true, message: this.$t('message.carManage.required'), trigger: "blur" },
+          { required: true, message: this.$t('message.carManage.required'), trigger: "change" }
+        ],
+        carType: [
+          { required: true, message: this.$t('message.carManage.required'), trigger: "blur" },
+          { required: true, message: this.$t('message.carManage.required'), trigger: "change" }
+        ],
+        driverTelephone: [
+          { required: true, message: this.$t('message.carManage.required'), trigger: "blur" },
+          { required: true, message: this.$t('message.carManage.required'), trigger: "change" }
+        ],
+        isBlack: [
+          { required: true, message: this.$t('message.carManage.required'), trigger: "blur" },
+          { required: true, message: this.$t('message.carManage.required'), trigger: "change" }
+        ],
+        driverWorkerId: [
+          { required: true, message: this.$t('message.carManage.required'), trigger: "blur" },
+          // {required: true, message: this.$t('message.carManage.required'), trigger: "change"}
+        ],
+        driverTelephone: [
+          { required: true, message: this.$t('message.carManage.required'), trigger: "blur" },
+          { required: true, message: this.$t('message.carManage.required'), trigger: "change" }
+        ],
+        driverName: [
+          { required: true, message: this.$t('message.carManage.required'), trigger: "blur" },
+          { required: true, message: this.$t('message.carManage.required'), trigger: "change" }
+        ],
+      },
+      options: [
+        /*{realName: "曾祥万", value: 1},
+        {realName: "李先生", value: 2},*/
+      ],
+      addEditForm: {},
+      pagInfo: {
+        pageNo: 1,//页数
+        pageSize: 10,//条数
+        total: 0,//总条数
+      },
+      List: [
+        /*{
+            deviceId: "124578",
+            deviceName: "扬尘监测1",
+            isClosed: 2,
+            address: "22",
+            createTime: "2019-05-05 16:55:46",
+        }*/
+      ],
+      Popup: {
+        type: 'add',
+        show: false
+      },
+      carTypeList: [],
+      carNumber: '',
+      isBlack: '',
+      appWorkerList: []
     }
+  },
+  methods: {
+    changeDriverFn() {
+      // let arr1=[],arr2=[]
+      // for (let index = 0; index < this.appWorkerList.length; index++) {
+      //     const element = this.appWorkerList[index];
+      //     if(this.addEditForm.driverWorkerId.indexOf(element.id)){
+      //         arr1.push(element.phoneNumber)
+      //         arr2.push(element.idCard)
+      //     }
+      // }
+      // console.log(arr1)
+      // this.addEditForm.driverTelephone=arr1.join(',')
+      // this.addEditForm.driverTelephone=arr2.join(',')
+    },
+    handle(type, show) {//打开弹窗前的统一处理
+      this.Popup = {
+        type: type,
+        show: show
+      }
+    },
+    add() {
+      this.handle('add', true);
+    },
+    edit(obj) {
+      this.addEditForm = JSON.parse(JSON.stringify(obj));
+      this.fileList = obj.carPhotosUrl;
+      console.log('类型============', obj);
+      if (typeof obj.carPhotosUrl === 'string') {
+        this.addEditForm.carPhotosUrl = obj.carPhotosUrl != "" ? JSON.parse(obj.carPhotosUrl) : [];
+        this.fileList = this.addEditForm.carPhotosUrl;
+        this.fileList.map((file) => {
+          console.log('url', file.url);
+          file.url = this.$store.state.FILEURL + file.url;
+        });
+      }
+      if (typeof obj.alarmPushWorkerId === 'string' && obj.alarmPushWorkerId != '') {
+        this.addEditForm.alarmPushWorkerId = obj.alarmPushWorkerId.split(',').map(String);
+      }
+      if (typeof obj.driverWorkerId === 'string' && obj.driverWorkerId != '') {
+        this.addEditForm.driverWorkerId = obj.driverWorkerId.split(',').map(String);
+      }
+      // this.$forceUpdate();
+      console.log('编辑', obj, 'fileList', this.fileList);
+      this.handle('edit', true);
+    },
+    deleteDev(obj) {
+      console.log('删除', obj);
+      this.$confirm(this.$t('message.personnelPosition.beaconManage.table.confirmText') + "【" + obj.carNumber + "】?", this.$t('message.personnelPosition.beaconManage.table.Tips'), {
+        confirmButtonText: this.$t('message.personnelPosition.confirmButtonText'),
+        cancelButtonText: this.$t('message.personnelPosition.cancelButtonText'),
+        type: "warning",
+      }).then(() => {
+        deleteCarInfoApi({ id: obj.id }).then(result => {
+          if (result.success) {
+            this.$message.success(result.message);
+            this.getList();
+          }
+        })
+      }).catch(() => {
+      });
+    },
+    submit() {
+      this.processTheFile();
+      let params = JSON.parse(JSON.stringify(this.addEditForm));
+      var arr = [], arr2 = JSON.parse(params.carPhotosUrl)
+      if (arr2.length > 0) {
+        arr2.forEach(element => {
+          var item = element
+          if (element.url.indexOf('http://') != -1) {
+            item.url = element.url.split('/image/')[1]
+          }
+          arr.push(item)
+        });
+      }
+      params.carPhotosUrl = JSON.stringify(arr)
+      params.projectSn = this.$store.state.projectSn;
+      if (this.addEditForm.alarmPushWorkerId) {
+        params.alarmPushWorkerId = this.addEditForm.alarmPushWorkerId.join(',');
+      }
+      if (this.addEditForm.driverWorkerId) {
+        params.driverWorkerId = this.addEditForm.driverWorkerId.join(',');
+      }
+      this.$refs.addEditForm.validate((valid) => {
+        if (valid) {
+          if (this.Popup.type === 'add') {
+            addCarInfoApi(params).then(result => {
+              if (result.success) {
+                this.$message.success(result.message);
+                this.getList();
+              }
+            })
+          } else if (this.Popup.type === 'edit') {
+            // this.processTheFile();
+            console.log('编辑信息', this.addEditForm)
+            editCarInfoApi(params).then(result => {
+              if (result.success) {
+                this.$message.success(result.message);
+                this.getList();
+              }
+            })
+          }
+          this.Popup.show = false;
+        } else {
+          return false;
+        }
+      });
+    },
+    refresh() {
+      this.carNumber = ''
+      this.isBlack = ''
+      this.pagInfo.pageNo = 1;//页数
+      this.pagInfo.pageSize = 10;//条数
+      this.getList();
+    },
+    getList() {
+      getCarInfoListApi({
+        pageNo: this.pagInfo.pageNo,
+        pageSize: this.pagInfo.pageSize,
+        projectSn: this.$store.state.projectSn,
+        carNumber: this.carNumber,
+        isBlack: this.isBlack
+      }).then(result => {
+        if (result.success) {
+          this.List = result.result.records;
+          this.pagInfo.total = result.result.total;
+          console.log('列表', result);
+          setTimeout(() => {
+            this.$previewRefresh();
+          }, 100);
+        }
+      })
+    },
+    close() {
+      this.addEditForm = {};
+      this.fileList = [];
+      this.$nextTick(() => {
+        this.$refs.addEditForm.clearValidate();
+      })
+    },
+    processTheFile() {//处理el上传的文件格式(结构)
+      this.addEditForm.carPhotosUrl = [];
+      this.fileList.map(item => {
+        if (!item.response) {
+          this.addEditForm.carPhotosUrl.push(item);
+          // console.log('符合的结构', item)
+        } else if (item.response) {
+          // console.log('不符合的结构', item)
+          this.addEditForm.carPhotosUrl.push({
+            name: item.response.data[0].filename,
+            url: item.response.data[0].imageUrl
+          });
+        }
+      })
+      console.log('处理el上传的结构后', this.addEditForm.carPhotosUrl);
+      this.addEditForm.carPhotosUrl = JSON.stringify(this.addEditForm.carPhotosUrl);
+      console.log('转字符串后', this.addEditForm.carPhotosUrl);
+      // console.log('处理el上传的结构后转字符串', JSON.stringify(this.registerInfo.licenseFile));
+      // console.log('最终要上传的图片', this.registerInfo.licenseFile)
+    },
+    handlePictureCardPreview() {
+      this.showImgUrl = this.addEditForm.carPhotosUrl[0].url;
+      // this.showImgUrl = this.$store.state.FILEURL + this.addEditForm.carPhotosUrl[0].url;
+      console.log('handlePictureCardPreview', this.showImgUrl);
+    },
+    handleSuccess(response, file, fileList) {
+      console.log('图片上传成功', fileList);
+      this.fileList = fileList;
+    },
+    handleRemove(response, fileList) {
+      this.fileList = fileList;
+    },
+    SizeChange(val) {
+      this.pagInfo.pageSize = val;
+      this.getList();
+    },
+    CurrentChange(val) {
+      this.pagInfo.pageNo = val;
+      this.getList();
+    },
+    getWorkerList() {
+      getcarTypeListApi({ projectSn: this.$store.state.projectSn }).then(result => {
+        this.carTypeList = result.result;
+      })
+    },
+    getLaborManagementList() {
+      getProjectChilderSystemUserListApi({ projectSn: this.$store.state.projectSn }).then(result => {
+        this.options = result.result;
+      })
+    },
+    getAppWorkerList() {
+      selectAppWorkerListApi({ projectSn: this.$store.state.projectSn, personType: 1, inserviceType: 1 }).then(result => {
+        console.log('查询司机信息的数组', result)
+        this.appWorkerList = result.result;
+      })
+    },
+  }
+}
 </script>
 <style lang="less">
-    .tables {
-        img {
-            cursor: pointer;
-        }
-    }
+.tables {
+  img {
+    cursor: pointer;
+  }
+}
 
-    .tableBtns {
-        display: flex;
-        justify-content: center;
-    }
+.tableBtns {
+  display: flex;
+  justify-content: center;
+}
 
-    .yj-dialogFormBox {
-        width: 462px;
-    }
-    .el-form-item__content .el-select__tags{
-          flex-wrap: nowrap
-   }
+.yj-dialogFormBox {
+  width: 462px;
+}
+.el-form-item__content .el-select__tags {
+  flex-wrap: nowrap;
+}
 </style>
\ No newline at end of file