Merge branch 'build' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into build

packages/grid/AppHomesteadManagement/components/Add.vue

@@ -32,7 +32,7 @@
                 </el-form-item>
               </div>
               <el-form-item label="所属村" prop="areaId">
-                <ai-area-get :instance="instance" v-model="formData.areaId" :name.sync="formData.areaName" />
+                <ai-area-get :root="sys.areaId" :instance="instance" v-model="formData.areaId" :name.sync="formData.areaName" />
               </el-form-item>
             </template>
           </ai-card>
@@ -203,7 +203,7 @@ export default {
     }
   },
   computed: {
-    ...mapState(['user']),
+    ...mapState(['user','sys']),
 
     isEdit() {
       return !!this.params.id

project/oms/apps/develop/AppDeployWxmp/AppDeployWxmp.vue

@@ -31,6 +31,7 @@
           <el-table-column slot="options" label="操作" fixed="right" align="center" width="300">
             <template slot-scope="{row}">
               <el-button type="text" @click="handleEdit(row)">编辑</el-button>
+              <el-button type="text" @click="handleDelete(row.id)">删除</el-button>
               <el-button type="text" @click="handleZip(row)" v-if="row.count==0">打包</el-button>
               <el-button type="text" @click="handleCancelZip(row)" v-else>停止</el-button>
               <el-button type="text" v-if="/^打包时间/.test(row.error)" @click="handleDownload(row)">下载</el-button>
@@ -214,7 +215,7 @@ export default {
     },
     handleDelete(ids) {
       this.$confirm("是否要删除该项目/系统?").then(() => {
-        this.instance.post("/node/autodeploy/delete", null, {
+        this.instance.post("/node/wxmp/delete", null, {
           params: {ids}
         }).then(res => {
           if (res?.code == 0) {

ui/lib/js/modules.js

@@ -5,7 +5,10 @@ import Vue from "vue"
 export const sys = {
   state: () => ({
     info: {},
-    theme: {}
+    theme: {},
+    location: {},
+    areaId: "",
+    areaName: ""
   }),
   mutations: {
     setSysInfo(state, info) {
@@ -13,17 +16,26 @@ export const sys = {
     },
     setTheme(state, theme) {
       state.theme = theme
+    },
+    setLocation(state, location) {
+      state.location = location
+    },
+    setArea(state, area) {
+      state.areaId = area.areaId
+      state.areaName = area.areaName
     }
   },
   actions: {
     getSystem({commit}, info) {
       return http.post("/app/appdvcpconfig/getSystemInfo", null, {withoutToken: true}).then(res => {
         if (res?.data) {
-          let {systemInfo, colorScheme, enableGreyFilter} = res.data
+          let {systemInfo, colorScheme, enableGreyFilter, location, areaId, areaName} = res.data
           systemInfo = JSON.parse(systemInfo || null) || {}
           colorScheme = JSON.parse(colorScheme || null) || {}
           commit("setSysInfo", {...info, ...systemInfo})
           commit("setTheme", {colorScheme, enableGreyFilter})
+          commit("setLocation", location)
+          commit("setArea", {areaId, areaName})
           return res.data
         } else return Promise.reject()
       }).catch(() => commit("setSysInfo", info))
@@ -53,7 +65,7 @@ export const user = {
     setUserExtra(state, extra = {}) {
       Object.keys(extra).map(e => Vue.set(state, e, extra[e]))
     },
-    setRoutes(state,routes){
+    setRoutes(state, routes) {
       state.routes = routes
     }
   },