Merge remote-tracking branch 'origin/master' into master

src/setting.js

@@ -10,7 +10,7 @@ let jumpPath = "";
 let host = "";
 if (isDev) {
     // jumpPath = "http://39.108.250.202/judgmentPoint/";
-    jumpPath = "http://192.168.31.154:8087/"; // 本地调试-需要启动本地判分点系统
+    jumpPath = "http://192.168.31.254:8087/"; // 本地调试-需要启动本地判分点系统
 
     host = "http://39.108.250.202:9000";
     // host = "http://39.108.250.202:9000";//线上

src/views/user/User.vue

@@ -10,31 +10,6 @@
                         </div>
                         <div>
                             <el-form label-width="80px">
-                                <el-row>
-                                    <el-col :span="8">
-                                        <el-form-item label="创建时间" class="userRadio">
-                                            <el-radio-group v-model="form.month">
-                                                <el-radio v-for="(item,index) in dateList" :key="index" :label="item.id" border>{{item.name}}</el-radio>
-                                            </el-radio-group>
-                                        </el-form-item>
-                                    </el-col>
-                                    <el-col :span="8">
-                                        <el-form-item label="自定义">
-                                            <el-date-picker
-                                                v-model="form.date"
-                                                align="right"
-                                                unlink-panels
-                                                type="daterange"
-                                                start-placeholder="开始日期"
-                                                end-placeholder="结束日期"
-                                                format="yyyy-MM-dd"
-                                                value-format="yyyy-MM-dd"
-                                                clearable
-                                                style="width: 100%"
-                                            ></el-date-picker>
-                                        </el-form-item>
-                                    </el-col>
-                                </el-row>
                                 <el-row>
                                     <el-col :span="4">
                                         <!--
@@ -90,7 +65,31 @@
                                         </el-form-item>
                                     </el-col> -->
                                 </el-row>
-
+                                <el-row>
+                                    <el-col :span="8">
+                                        <el-form-item label="创建时间" class="userRadio">
+                                            <el-radio-group v-model="form.month">
+                                                <el-radio v-for="(item,index) in dateList" :key="index" :label="item.id" border>{{item.name}}</el-radio>
+                                            </el-radio-group>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="8">
+                                        <el-form-item label="自定义">
+                                            <el-date-picker
+                                                v-model="form.date"
+                                                align="right"
+                                                unlink-panels
+                                                type="daterange"
+                                                start-placeholder="开始日期"
+                                                end-placeholder="结束日期"
+                                                format="yyyy-MM-dd"
+                                                value-format="yyyy-MM-dd"
+                                                clearable
+                                                style="width: 100%"
+                                            ></el-date-picker>
+                                        </el-form-item>
+                                    </el-col>
+                                </el-row>
 
                             </el-form>
                         </div>