7.14

2 years ago · 695205ed08
7 changed files with 23 additions and 4 deletions
--- a/supervise-risk-ui/src/views/risk/RiskManage/RiskAdd.vue
+++ b/supervise-risk-ui/src/views/risk/RiskManage/RiskAdd.vue
@ -104,7 +104,7 @@ export default {
 				typeSid:'',
        remarks:'',
        reportTarget:'',
-        list:[]
+        // list:[]
 			},
 			rules: {
 				name: [{ required: true, message: '风险等级名称不能为空', trigger: 'blur' }],
@ -175,7 +175,7 @@ export default {
 			_this.formobj.typeCode = vdata.typeCode 
 			_this.formobj.reportTarget = vdata.reportTarget 
 			_this.formobj.remarks = vdata.remarks
-			_this.selectedOptions= vdata.list
+			// _this.selectedOptions= vdata.list
 		},
    getParentsById(list, id) {
      for (let i in list) {
--- a/warehousing-system/project_web/package.json
+++ b/warehousing-system/project_web/package.json
@ -14,6 +14,7 @@
    "element-ui": "^2.4.5",
    "less-loader": "^5.0.0",
    "vue": "^2.6.11",
+    "vue-amap": "^0.5.10",
    "vue-quill-editor": "^3.0.6",
    "vue-router": "^3.2.0"
  },
--- a/warehousing-system/project_web/public/index.html
+++ b/warehousing-system/project_web/public/index.html
@ -5,6 +5,7 @@
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width,initial-scale=1.0">
    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <!-- <script type="text/javascript" src="https://webapi.amap.com/maps?key=你自己的key!!!&v=1.4.4&plugin=AMap.Geolocation,AMap.Autocomplete,AMap.PlaceSearch,AMap.Scale,AMap.OverView,AMap.ToolBar,AMap.MapType,AMap.PolyEditor,AMap.Geocoder,AMap.CircleEditor"></script>  -->
    <title>汇融云仓贷后监管平台</title>
  </head>
  <body>
--- a/warehousing-system/project_web/src/components/Home.vue
+++ b/warehousing-system/project_web/src/components/Home.vue
@ -160,7 +160,6 @@ export default {
      if (result.status !== 200) return this.$message.error('获取权限列表失败')
      this.menuList = result.data
      this.menuList.unshift(this.picture)
-      console.log(this.menuList);
    },
    // 设定左侧折叠展开效果
    collspseClick () {
--- a/warehousing-system/project_web/src/components/initial_value/storehouse.vue
+++ b/warehousing-system/project_web/src/components/initial_value/storehouse.vue
@ -251,6 +251,7 @@
              >
              </el-option>
            </el-select>
+            <el-button size="small" type="primary" @click="cancelList">重选</el-button>
          </el-form-item>
        </el-col>
        </el-row>
@ -747,6 +748,8 @@ export default {
      this.title = "新增仓库";
      this.storehouseDialogVisible = true;
      this.jingweidu=''
+      this.changeCity=true
+      this.changeCounty=true     
    },
    async getcustListList () {
      const { data: result } = await this.$http.get('/v1/shstorehouse/fetchEntList')
@ -917,6 +920,13 @@ export default {
        });
      }
    },
+    cancelList(){
+      this.form.cityName = "";
+      this.form.countyName = "";
+      this.form.provinceName = "";
+      this.changeCity = true;   
+      this.changeCounty= true;
+    },
    async LookStorehousedialog(purchase) {
      this.addPurchaseDialogVisible = true;
      const _this = this;
--- a/warehousing-system/project_web/src/components/pictureList/pictureList.vue
+++ b/warehousing-system/project_web/src/components/pictureList/pictureList.vue
@ -28,7 +28,7 @@
            </div>
          </div>
          <div class="housingResource">{{ item.housingResource }}</div>
-          <div class="monthlyPrice">{{ item.monthlyPrice }}<span v-if="item.monthlyPrice">万/月</span> </div>
+          <div class="monthlyPrice">{{ item.monthlyPrice }}<span v-if="item.monthlyPrice">元/月</span> </div>
        </div>
        <div class="pages">
          <el-pagination
--- a/warehousing-system/project_web/src/main.js
+++ b/warehousing-system/project_web/src/main.js
@ -1,6 +1,7 @@
 import Vue from 'vue'
 import App from './App.vue'
 import router from './router'
+import VueAMap from 'vue-amap'
 import './plugins/element.js'
 import './assets/css/global.css'
 import './assets/ali-icon/iconfont.css'
@ -27,6 +28,13 @@ Vue.prototype.$http = axios
 /* 将富文本编辑器注册为全局可用的组件 */
 Vue.use(VueQuillEditor)

+Vue.use(VueAMap);
+// VueAMap.initAMapApiLoader({
+//   key: '你自己的key!!!',
+//   plugin: ['AMap.Autocomplete', 'AMap.PlaceSearch', 'AMap.Scale', 'AMap.OverView', 'AMap.ToolBar', 'AMap.MapType', 'AMap.PolyEditor', 'AMap.CircleEditor','AMap.Geocoder','AMap.Geolocation','AMap.MarkerClusterer'],
+//   // 默认高德 sdk 版本为 1.4.4
+//   v: '1.4.4'
+// });
 Vue.config.productionTip = false

 new Vue({