feat: 功能模块新增

src/assets/js/http.js

@@ -73,7 +73,7 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL = 'http://101.43.164.214:12350/'//中建五局线上
   // axios.defaults.baseURL = 'http://182.90.224.147:15551/'//港投(成润)项目线上(1)
   // axios.defaults.baseURL = 'http://118.121.198.147:23232/'//港投(成润)正式
-  axios.defaults.baseURL ='http://jxj.zhgdyun.com:100/' //演示平台/·
+  // axios.defaults.baseURL ='http://jxj.zhgdyun.com:100/' //演示平台/·
   // axios.defaults.baseURL ='http://192.168.34.221:8188/' //郭圣雄本地
   // axios.defaults.baseURL ='http://192.168.34.221:30001/' //郭圣雄本地
   // axios.defaults.baseURL ='http://192.168.34.221:12350/' //金林湾本地
@@ -83,7 +83,7 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL ='http://101.43.164.214:45001/' //上海张江
   // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工）
   // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
-  // axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
+  axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
   // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
   // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
   // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈

src/components/closePage.vue

@@ -33,7 +33,7 @@ export default {
       // })
 
       if ( this.styleType != 3 && this.$route.path.indexOf('/project/dataBoard') != -1 ||
-      this.$route.path.indexOf('/project/videoOverview') != -1 || this.$route.path.indexOf('/project/environmentalOverview') != -1 ||
+      this.$route.path.indexOf('/project/videoOverview') != -1 || this.$route.path.indexOf('/project/replayVideo') != -1 || this.$route.path.indexOf('/project/environmentalOverview') != -1 ||
        this.$route.path.indexOf('/project/projectSummary') != -1 || this.$route.path.indexOf('/project/imgRanging') != -1 || 
        this.$route.path.indexOf('/project/warningManage') != -1 ) {
         console.log(window.location.href.split('#/')[0] + '#/projectIndex')

src/router/index.js

@@ -20,7 +20,8 @@ const routes2 = [
     path: "/login",
     name: "login",
     // component: () => import('../views/home/login.vue')
-    component: () => import("../views/home/login_v1.vue"),
+    // component: () => import("../views/home/login_v1.vue"),
+    component: () => import("../views/home/login_v2.vue"),
   },
   {
     path: "/sign",

src/views/jxjadmin/systemSettings.vue

@@ -8,7 +8,7 @@
           :model="form"
           ref="form"
           :rules="rules"
-          label-width="160px"
+          label-width="165px"
         >
           <el-row :gutter="12">
             <el-col :span="6">
@@ -132,6 +132,23 @@
                 ></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="默认审批用户注册企业" prop="auditCompany">
+                <div class="select-content">
+                  <div class="tip-text" @click="isSelectCompany = !isSelectCompany">
+                    <span>未选择</span>
+                    <i class="el-icon-arrow-down" v-show="!isSelectCompany"></i>
+                    <i class="el-icon-arrow-up" v-show="isSelectCompany"></i>
+                  </div>
+                  <div class="select-list" v-if="isSelectCompany">
+                    <div class="select-list-item" v-for="(item,index) in companyList" :key="index">
+                        <span>测试企业</span>
+                        <el-checkbox v-model="item.checked" />
+                    </div>
+                  </div>
+                </div>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="12">
             <el-col :span="6">
@@ -275,6 +292,13 @@ export default {
             ),
             trigger: 'blur'
           }
+        ],
+        auditCompany: [
+          {
+            required: true,
+            message: '请选择',
+            trigger: 'change'
+          }
         ]
       },
       dialogVisible: false,
@@ -282,7 +306,15 @@ export default {
       fileList: [],
       fileList2: [],
       fileList3: [],
-      fileList4: []
+      fileList4: [],
+      companyList: [
+        {name: '测试企业1',checked: false},
+        {name: '测试企业2',checked: false},
+        {name: '测试企业3',checked: true},
+        {name: '测试企业4',checked: false},
+        {name: '测试企业5',checked: true}
+      ],
+      isSelectCompany: false
     }
   },
   mounted() {
@@ -470,6 +502,38 @@ export default {
   // width: 50%;
   width: 97%;
   // max-width: 430px;
+  .select-content{
+    box-sizing: border-box;
+    width: 150px;
+    height: 34px;
+    line-height: 34px !important;
+    border-radius: 3px;
+    border: 1px solid #D7DBE9;
+    padding: 0 15px;
+    position: relative;
+    .tip-text{
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      cursor: pointer;
+    }
+    .select-list{
+      width: 100%;
+      position: absolute;
+      top: 34px;
+      left: -3px;
+      z-index: 10;
+      background-color: #fff;
+      border-radius: 4px;
+      box-shadow: 4px 4px 10px #E3E3E3;
+      padding: 10px 20px;
+      &-item{
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+      }
+    }
+  }
 }
 .el-upload__tip {
   line-height: 20px;