Merge branch 'dev' of http://39.101.143.165:8090/sxzgd/vue-insagent-pc into dev

src/components/Form/ProductCostForm.vue

@@ -159,6 +159,10 @@
                                         <el-option v-for="dict in formItems.dictLabal" :key="dict.code" :label="dict.name"
                                                    :value="formItems.attrName == '车辆类型' ? dict.code : dict.name"></el-option>
                                     </el-select>
+                                    <el-select v-if="formItems.attrCode == 'RateFloatFlag'" v-model="formItems.operator" placeholder="请选择" style="width: 120px;margin-left: 20px;">
+                                        <el-option label="包含" value="0"></el-option>
+                                        <el-option label="不包含" value="1"></el-option>
+                                    </el-select>
                                     <el-checkbox style="margin-left: 10px;" v-if="formItems.attrCode == 'LicenseNo'"
                                                  v-model="LicenseNoChecked"
                                                  @change="LicenseNoCheckedChange($event, 'LicenseNo', 'min')">全选</el-checkbox>

src/http/moudules/login.js

@@ -16,7 +16,7 @@ export const login = data => {
 // 登录2
 export const login2 = data => {
   return axios({
-    url: '/login2',
+    url: '/system/login',
     method: 'post',
     data
   })