yin_yu820 2 anni fa
parent
commit
307f405326

+ 1 - 1
public/index.html

@@ -8,7 +8,7 @@
     <title><%= htmlWebpackPlugin.options.title %></title>
 
     <!--小程序SDK 只有在小程序容器中才能加载到 -->
-	  <!-- <script src="shinemosdk://20000/index.js"></script> -->
+	  <script src="shinemosdk://20000/index.js"></script>
   </head>
   <body>
     <noscript>

+ 1 - 6
src/App.vue

@@ -1,11 +1,6 @@
 <template>
 	<router-view></router-view>
-	<van-tabbar v-model="active" route  v-show="showStatus" >
-        <van-tabbar-item replace to="/setting" name="toBeDone" icon="notes-o">我的待办</van-tabbar-item>
-        <van-tabbar-item replace to="/setting" name="siteMan" icon="shop-o">场所管理</van-tabbar-item>
-        <van-tabbar-item replace to="/setting" name="activityMan" icon="newspaper-o">活动管理</van-tabbar-item>
-        <van-tabbar-item replace to="/setting" name="setting" icon="friends-o">个人中心</van-tabbar-item>
-    </van-tabbar>
+	
 </template>
 
 <script>

+ 16 - 0
src/api/nonReligiousInformation/nonReligiousInformationService.js

@@ -0,0 +1,16 @@
+import request from '@/utils/request'
+export default class nonReligiousInformationService {
+    // 保存
+    save(inputForm) {
+        return request.post(
+            '/nonreligiousinformation/nonReligiousInformation/save',
+            inputForm
+        )
+    }
+    list(params) {
+        return request.get(
+            `/nonreligiousinformation/nonReligiousInformation/list`,
+            params
+        )
+    }
+}

+ 16 - 0
src/api/religiousConference/religiousConferenceService.js

@@ -0,0 +1,16 @@
+import request from '@/utils/request'
+export default class religiousConferenceService {
+    // 保存
+    save(inputForm) {
+        return request.post(
+            '/zzcssb/religiousConference/save',
+            inputForm
+        )
+    }
+    list(params) {
+        return request.get(
+            `/zzcssb/religiousConference/list`,
+            params
+        )
+    }
+}

+ 16 - 0
src/api/securityFacilitiesErr/securityFacilitiesErrService.js

@@ -0,0 +1,16 @@
+import request from '@/utils/request'
+export default class securityFacilitiesErrService {
+    // 保存
+    save(inputForm) {
+        return request.post(
+            '/afssyc/securityFacilitiesErr/save',
+            inputForm
+        )
+    }
+    list(params) {
+        return request.get(
+            `/afssyc/securityFacilitiesErr/list`,
+            params
+        )
+    }
+}

+ 7 - 0
src/api/sys/userSets.js

@@ -18,6 +18,13 @@ export default class userSets {
             params
         )
     };
+    //修改密码
+    ChangePass(params) {
+        return request.put(
+            `/sys/user/savePwd`,
+            params
+        )
+    };
 
     //盐政通测试用户同步规则
     SchemaService(params) {

+ 9 - 1
src/router/index.js

@@ -4,7 +4,7 @@ const routes = [{
         path: '/',
         name: 'home',
         component: () =>
-            import ('../views/login/login.vue'),
+            import ('../views/tab_a/tabAll.vue'),
         meta: {
             isShowTarbar: false,
         }
@@ -25,6 +25,14 @@ const routes = [{
             isShowTarbar: false,
         }
     }, {
+        path: '/changePassword',
+        name: 'changePassword',
+        component: () =>
+            import ('../views/login/changePassword.vue'),
+        meta: {
+            isShowTarbar: false,
+        }
+    },{
         path: '/tab_a',
         name: 'tab_a',
         component: () =>

+ 3 - 0
src/store/index.js

@@ -14,8 +14,11 @@ const store =createStore({
             window.localStorage.setItem(TOKEN_Key,state.user);
         },
         setPcToken(state,data){
+            console.log("设置token1");
             state.pctoken=data;
+            console.log("设置token2");
             window.localStorage.setItem(PCTOKEN_Key,state.pctoken);
+            console.log("设置token3"+state.pctoken);
         },
         setSelectColor(state,data){
             state.selectcolor=data;

+ 263 - 5
src/views/activityMan/nonReligiousInformation/nonReligiousInformationList.vue

@@ -1,6 +1,264 @@
 <template>
-    <div class="about">
-      <h1>This is an about page</h1>
-    </div>
-  </template>
-  
+  <van-nav-bar
+    title="其他有害信息"
+    left-text=""
+    right-text="上报"
+    left-arrow
+    @click-left="onClickLeft"
+    @click-right="onClickRight"
+  />
+  <van-search v-model="value" shape="round" placeholder="请输入搜索关键词" />
+  <van-tabs
+    v-model:active="active"
+    title-inactive-color="#bdbdbd"
+    title-active-color="#36a7f3"
+    @click-tab="onClickTab"
+  >
+    <van-tab title="未审核" name="0">
+      <van-list
+        v-model:loading="loading"
+        :finished="finished"
+        finished-text="没有更多了"
+        @load="onLoad"
+      >
+        <van-swipe-cell
+          v-for="item in list"
+          :key="item"
+          :before-close="beforeClose"
+        >
+          <div class="list_item" @click="goInfo(item.id)">
+            <div class="item-left">
+              <p style="color: #c4c4c4">{{ item.updateDate }}</p>
+              <p style="color: red">待审核</p>
+            </div>
+            <van-cell is-link >
+              <template #title >
+                {{ getCategories(item.nonReligiousCategories) }}({{ item.placeSelectName }})
+              </template>
+              <template #label>
+                {{ item.siteName.organizationName }}
+              </template>
+            </van-cell>
+            
+          </div>
+          <template #right>
+            <van-button square type="danger" text="删除" class="button" />
+            <van-button
+              square
+              type="primary"
+              text="修改"
+              class="button"
+              @click="updateItem(item)"
+            />
+          </template>
+        </van-swipe-cell>
+      </van-list>
+    </van-tab>
+    <van-tab title="已审核" name="1">
+      <van-list
+        v-model:loading="loading"
+        :finished="finished"
+        finished-text="没有更多了"
+        @load="onLoad"
+      >
+        <van-swipe-cell
+          v-for="item in list"
+          :key="item"
+          :before-close="beforeClose"
+        >
+          <div class="list_item" @click="goInfo(item.id)">
+            <div class="item-left">
+              <p style="color: #c4c4c4">{{ item.updateDate }}</p>
+              <p style="color: gray">已审核</p>
+            </div>
+            <van-cell is-link >
+              <template #title >
+                {{ getCategories(item.nonReligiousCategories) }}({{ item.placeSelectName }})
+              </template>
+              <template #label>
+                {{ item.siteName.organizationName }}
+              </template>
+            </van-cell>
+          </div>
+        </van-swipe-cell>
+      </van-list>
+    </van-tab>
+  </van-tabs>
+</template>
+
+<script>
+import { ref } from "vue";
+import router from "@/router";
+import nonReligiousInformationService from "@/api/nonReligiousInformation/nonReligiousInformationService";
+export default {
+name: "nonReligiousInformationList",
+setup() {
+  const onClickLeft = () => {
+    history.back();
+  };
+  const onClickRight = () => {
+    router.push("/nonReligiousInformationView");
+  };
+  let tabIndex = ref(0);
+  
+  //tab切换
+  let active = ref(0);
+  const onClickTab = (val) => {
+    // 清空列表数据
+    finished.value = false;
+    list.value = [];
+    // 重新加载数据
+    // 将 loading 设置为 true,表示处于加载状态
+    loading.value = true;
+    index = 0;
+    if (val.name == 0) {
+      onLoad(0);
+    } else {
+      onLoad(1);
+    }
+  };
+  // 列表
+  let list = ref([]);
+  const loading = ref(false);
+  const finished = ref(false);
+  let index = 0;
+  const onLoad = (val) => {
+    // 异步更新数据
+    new nonReligiousInformationService()
+      .list({
+        current: index + 1,
+        size: 10,
+        assessment:val ? val : 0,
+      })
+      .then((res) => {
+        list.value.push(...res.records) ;
+        // 加载状态结束
+        loading.value = false;        
+        // 数据全部加载完成
+        if (res.records.length < 10) {
+          finished.value = true;
+        }
+        index++;        
+      });
+  };
+  //字典配置
+  const getCategories= (key ) => {
+    let re="";
+    switch(key){
+      case "1":
+          re="宗教组织";
+          break;
+      case "10":
+          re="邪教组织";
+          break;
+      case "11":
+          re="地下神学院";
+          break;
+      case "2":
+          re="地下教会";
+          break;
+      case "3":
+          re="韩美境外渗透组织";
+          break;
+      case "4":
+          re="本地精神控制类有害培训机构";
+          break;      
+      case "5":
+          re="“呼喊派”骨干组织";
+          break;
+      case "6":
+          re="“改革宗”地下教会组织";
+          break;
+      case "7":
+          re="藏传佛教本地组织";
+          break;
+      case "8":
+          re="学生传教组织";
+          break;
+      case "9":
+          re="“义诊医疗”地下教会组织";
+          break;
+      case "91":
+          re="“亚文化”传教组织";
+          break;
+      case "92":
+          re="重点公司组织";
+          break;          
+    }
+    return re;
+  };
+
+  
+  
+  // 搜索
+  let value = ref("");
+  // 删除确认
+  const beforeClose = ({ position }) => {
+    switch (position) {
+      case "left":
+      case "cell":
+      case "outside":
+        return true;
+      case "right":
+        return new Promise((resolve) => {
+          showConfirmDialog({
+            title: "确定删除吗?",
+          }).then(resolve);
+        });
+    }
+  };
+  return {
+    onClickLeft,
+    onClickTab,
+    list,
+    onLoad,
+    getCategories,
+    loading,
+    finished,
+    value,
+    onClickRight,
+    tabIndex,
+    beforeClose,
+  };
+},
+};
+</script>
+
+<style>
+body {
+background: #f5f5f5;
+}
+.nav_tab {
+width: 100vw;
+display: flex;
+text-align: center;
+background: #fff;
+margin: 10px 0;
+}
+.tab {
+flex: 1;
+line-height: 40px;
+font-size: 14px;
+}
+.active {
+background: #36a7f3;
+color: #fff;
+}
+.van-list {
+height: 80%;
+margin-top: 5px;
+}
+.list_item {
+display: flex;
+background: #fff;
+}
+.item-left {
+text-align: center;
+width: 30%;
+font-size: 12px;
+border-right: 1px solid #eee;
+}
+.button {
+height: 100%;
+}
+</style>

+ 214 - 5
src/views/activityMan/religiousConference/religiousConferenceList.vue

@@ -1,6 +1,215 @@
 <template>
-    <div class="about">
-      <h1>This is an about page</h1>
-    </div>
-  </template>
-  
+  <van-nav-bar
+    title="负责人会议"
+    left-text=""
+    right-text="上报"
+    left-arrow
+    @click-left="onClickLeft"
+    @click-right="onClickRight"
+  />
+  <van-search v-model="value" shape="round" placeholder="请输入搜索关键词" />
+  <van-tabs
+    v-model:active="active"
+    title-inactive-color="#bdbdbd"
+    title-active-color="#36a7f3"
+    @click-tab="onClickTab"
+  >
+    <van-tab title="未审核" name="0">
+      <van-list
+        v-model:loading="loading"
+        :finished="finished"
+        finished-text="没有更多了"
+        @load="onLoad"
+      >
+        <van-swipe-cell
+          v-for="item in list"
+          :key="item"
+          :before-close="beforeClose"
+        >
+          <div class="list_item" @click="goInfo(item.id)">
+            <div class="item-left">
+              <p style="color: #c4c4c4">{{ item.updateDate }}</p>
+              <p style="color: red">待审核</p>
+            </div>
+            <van-cell is-link>
+              <template #title >
+                {{ item.siteName.name }}({{ item.meetingTime }})
+              </template>
+              <template #label>
+                {{ item.participants.name }}
+              </template>
+            </van-cell>
+            
+          </div>
+          <template #right>
+            <van-button square type="danger" text="删除" class="button" />
+            <van-button
+              square
+              type="primary"
+              text="修改"
+              class="button"
+              @click="updateItem(item)"
+            />
+          </template>
+        </van-swipe-cell>
+      </van-list>
+    </van-tab>
+    <van-tab title="已审核" name="1">
+      <van-list
+        v-model:loading="loading"
+        :finished="finished"
+        finished-text="没有更多了"
+        @load="onLoad"
+      >
+        <van-swipe-cell
+          v-for="item in list"
+          :key="item"
+          :before-close="beforeClose"
+        >
+          <div class="list_item" @click="goInfo(item.id)">
+            <div class="item-left">
+              <p style="color: #c4c4c4">{{ item.updateDate }}</p>
+              <p style="color: gray">已审核</p>
+            </div>            
+            <van-cell is-link>
+              <template #title >
+                {{ item.siteName.name }}({{ item.meetingTime }})
+              </template>
+              <template #label>
+                {{ item.participants.name }}
+              </template>
+            </van-cell>
+          </div>
+        </van-swipe-cell>
+      </van-list>
+    </van-tab>
+  </van-tabs>
+</template>
+
+<script>
+import { ref } from "vue";
+import router from "@/router";
+import religiousConferenceService from "@/api/religiousConference/religiousConferenceService";
+export default {
+name: "religiousConferenceList",
+setup() {
+  const onClickLeft = () => {
+    history.back();
+  };
+  const onClickRight = () => {
+    router.push("/religiousConferenceView");
+  };
+  let tabIndex = ref(0);
+  
+  //tab切换
+  let active = ref(0);
+  const onClickTab = (val) => {
+    // 清空列表数据
+    finished.value = false;
+    list.value = [];
+    // 重新加载数据
+    // 将 loading 设置为 true,表示处于加载状态
+    loading.value = true;
+    index = 0;
+    if (val.name == 0) {
+      onLoad(0);
+    } else {
+      onLoad(1);
+    }
+  };
+  // 列表
+  let list = ref([]);
+  const loading = ref(false);
+  const finished = ref(false);
+  let index = 0;
+  const onLoad = (val) => {
+    // 异步更新数据
+    console.log(val);
+    new religiousConferenceService()
+      .list({
+        current: index + 1,
+        size: 10,
+        assessment:val ? val : 0,
+      })
+      .then((res) => {
+        list.value.push(...res.records) ;
+        // 加载状态结束
+        loading.value = false;        
+        // 数据全部加载完成
+        if (res.records.length < 10) {
+          finished.value = true;
+        }
+        index++;
+      });
+  };
+  // 搜索
+  let value = ref("");
+  // 删除确认
+  const beforeClose = ({ position }) => {
+    switch (position) {
+      case "left":
+      case "cell":
+      case "outside":
+        return true;
+      case "right":
+        return new Promise((resolve) => {
+          showConfirmDialog({
+            title: "确定删除吗?",
+          }).then(resolve);
+        });
+    }
+  };
+  return {
+    onClickLeft,
+    onClickTab,
+    list,
+    onLoad,
+    loading,
+    finished,
+    value,
+    onClickRight,
+    tabIndex,
+    beforeClose,
+  };
+},
+};
+</script>
+
+<style>
+body {
+background: #f5f5f5;
+}
+.nav_tab {
+width: 100vw;
+display: flex;
+text-align: center;
+background: #fff;
+margin: 10px 0;
+}
+.tab {
+flex: 1;
+line-height: 40px;
+font-size: 14px;
+}
+.active {
+background: #36a7f3;
+color: #fff;
+}
+.van-list {
+height: 80%;
+margin-top: 5px;
+}
+.list_item {
+display: flex;
+background: #fff;
+}
+.item-left {
+text-align: center;
+width: 30%;
+font-size: 12px;
+border-right: 1px solid #eee;
+}
+.button {
+height: 100%;
+}
+</style>

+ 225 - 82
src/views/activityMan/securityFacilitiesErr/securityFacilitiesErrList.vue

@@ -1,87 +1,230 @@
 <template>
-    <van-nav-bar
-      title="安防设施异常"
-      left-text=""
-      left-arrow
-      @click-left="onClickLeft"
-    />
-    <van-search
-    v-model="value"
-    shape="round"
-    placeholder="请输入搜索关键词"
+  <van-nav-bar
+    title="安防设施异常"
+    left-text=""
+    right-text="上报"
+    left-arrow
+    @click-left="onClickLeft"
+    @click-right="onClickRight"
   />
-    <van-list
-      v-model:loading="loading"
-      :finished="finished"
-      finished-text="没有更多了"
-    >
-      <van-button type="primary" size="small" to="/placeActivity">新增</van-button>
-      <van-cell v-for="item in list" :key="item" :title="item" label="2222" is-link>
-        <template #value>
-          11111
-        </template>
-      </van-cell>
-    </van-list>
-  </template>
+  <van-search v-model="value" shape="round" placeholder="请输入搜索关键词" />
+  <van-tabs
+    v-model:active="active"
+    title-inactive-color="#bdbdbd"
+    title-active-color="#36a7f3"
+    @click-tab="onClickTab"
+  >
+    <van-tab title="未审核" name="0">
+      <van-list
+        v-model:loading="loading"
+        :finished="finished"
+        finished-text="没有更多了"
+        @load="onLoad"
+      >
+        <van-swipe-cell
+          v-for="item in list"
+          :key="item"
+          :before-close="beforeClose"
+        >
+          <div class="list_item" @click="goInfo(item.id)">
+            <div class="item-left">
+              <p style="color: #c4c4c4">{{ item.updateDate }}</p>
+              <p style="color: red">待审核</p>
+            </div>
+            <van-cell is-link v-if="item.facilityType==0">
+              <template #title >
+                {{ item.siteName.name }}({{ item.videoAudioPoint.name }})
+              </template>
+              <template #label>
+                {{ item.position }}
+              </template>
+            </van-cell>
+            <van-cell is-link v-if="item.facilityType==1">
+              <template #title >
+                {{ item.siteName.name }}({{ item.siteFireProtection.name }})
+              </template>
+              <template #label>
+                {{ item.position }}
+              </template>
+            </van-cell>
+          </div>
+          <template #right>
+            <van-button square type="danger" text="删除" class="button" />
+            <van-button
+              square
+              type="primary"
+              text="修改"
+              class="button"
+              @click="updateItem(item)"
+            />
+          </template>
+        </van-swipe-cell>
+      </van-list>
+    </van-tab>
+    <van-tab title="已审核" name="1">
+      <van-list
+        v-model:loading="loading"
+        :finished="finished"
+        finished-text="没有更多了"
+        @load="onLoad"
+      >
+        <van-swipe-cell
+          v-for="item in list"
+          :key="item"
+          :before-close="beforeClose"
+        >
+          <div class="list_item" @click="goInfo(item.id)">
+            <div class="item-left">
+              <p style="color: #c4c4c4">{{ item.updateDate }}</p>
+              <p style="color: gray">已审核</p>
+            </div>
+            <van-cell is-link v-if="item.facilityType==0">
+              <template #title >
+                {{ item.siteName.name }}({{ item.videoAudioPoint.name }})
+              </template>
+              <template #label>
+                {{ item.position }}
+              </template>
+            </van-cell>
+            <van-cell is-link v-if="item.facilityType==1">
+              <template #title >
+                {{ item.siteName.name }}({{ item.siteFireProtection.name }})
+              </template>
+              <template #label>
+                {{ item.position }}
+              </template>
+            </van-cell>
+          </div>
+        </van-swipe-cell>
+      </van-list>
+    </van-tab>
+  </van-tabs>
+</template>
 
-  <script>
-  import  qs  from "qs";
-
-  export default {
-		data() {
-			return{
-        value:"",
-        list:[],
-        loading:false,
-        finished:false,
-        title:'民宗干事',
-				username:"",
-				sms:"",
-				password:"",
-				password2:"",
-				con1:"0",
-        searchForm: {
-            siteName: {
-                id: ''
-            }
-        },
-			}
-		},
-
-		async created(){
-			let aa=qs.stringify({
-            'current': 1,
-            'size': 10,
-            'orders': [],
-            ...this.searchForm
-            },  { allowDots: true, arrayFormat: 'indices' })
-
-			let id=this.$route.query.id;
-
-			var res = await this.$API.activityMan.siteInspectionList.get(aa);
-      console.log(res);
-
-		},
-
-		methods:{
-        onClickLeft(){
-          history.back();
-        },
-      },
+<script>
+import { ref } from "vue";
+import router from "@/router";
+import securityFacilitiesErrService from "@/api/securityFacilitiesErr/securityFacilitiesErrService";
+export default {
+name: "securityFacilitiesErrList",
+setup() {
+  const onClickLeft = () => {
+    history.back();
   };
+  const onClickRight = () => {
+    router.push("/securityFacilitiesErrView");
+  };
+  let tabIndex = ref(0);
+  
+  //tab切换
+  let active = ref(0);
+  const onClickTab = (val) => {
+    // 清空列表数据
+    finished.value = false;
+    list.value = [];
+    // 重新加载数据
+    // 将 loading 设置为 true,表示处于加载状态
+    loading.value = true;
+    index = 0;
+    if (val.name == 0) {
+      onLoad(0);
+    } else {
+      onLoad(1);
+    }
+  };
+  // 列表
+  let list = ref([]);
+  const loading = ref(false);
+  const finished = ref(false);
+  let index = 0;
+  const onLoad = (val) => {
+    // 异步更新数据
+    console.log(val);
+    new securityFacilitiesErrService()
+      .list({
+        current: index + 1,
+        size: 10,
+        assessment:val ? val : 0,
+      })
+      .then((res) => {
+        list.value.push(...res.records) ;
+        // 加载状态结束
+        loading.value = false;        
+        // 数据全部加载完成
+        if (res.records.length < 10) {
+          finished.value = true;
+        }
+        index++;
+      });
+  };
+  // 搜索
+  let value = ref("");
+  // 删除确认
+  const beforeClose = ({ position }) => {
+    switch (position) {
+      case "left":
+      case "cell":
+      case "outside":
+        return true;
+      case "right":
+        return new Promise((resolve) => {
+          showConfirmDialog({
+            title: "确定删除吗?",
+          }).then(resolve);
+        });
+    }
+  };
+  return {
+    onClickLeft,
+    onClickTab,
+    list,
+    onLoad,
+    loading,
+    finished,
+    value,
+    onClickRight,
+    tabIndex,
+    beforeClose,
+  };
+},
+};
+</script>
 
-
-
-  </script>
-
-  <style>
-  .van-button {
-    top: -5px;
-  }
-
-  .van-list {
-    height: 80%;
-    margin-top: 5px;
-  }
-
-  </style>
+<style>
+body {
+background: #f5f5f5;
+}
+.nav_tab {
+width: 100vw;
+display: flex;
+text-align: center;
+background: #fff;
+margin: 10px 0;
+}
+.tab {
+flex: 1;
+line-height: 40px;
+font-size: 14px;
+}
+.active {
+background: #36a7f3;
+color: #fff;
+}
+.van-list {
+height: 80%;
+margin-top: 5px;
+}
+.list_item {
+display: flex;
+background: #fff;
+}
+.item-left {
+text-align: center;
+width: 30%;
+font-size: 12px;
+border-right: 1px solid #eee;
+}
+.button {
+height: 100%;
+}
+</style>

+ 21 - 7
src/views/activityMan/siteInspection/siteInspectionList.vue

@@ -1,6 +1,5 @@
 <template>
     <van-nav-bar
-      fixed
       title="场所检查情况"
       left-text=""
       right-text="上报"
@@ -16,10 +15,10 @@
       @load="onLoad"
     >
     <div class="nav_tab">
-      <div class="tab" :class="tabIndex ? '' : 'active'" @click="tabIndex = 0">
+      <div class="tab" :class="tabIndex ? '' : 'active'" @click="onClickTab(0)">
         未审核
       </div>
-      <div class="tab" :class="tabIndex ? 'active' : ''" @click="tabIndex = 1">
+      <div class="tab" :class="tabIndex ? 'active' : ''" @click="onClickTab(1)">
         已审核
       </div>
     </div>
@@ -31,7 +30,8 @@
       <div class="list_item">
         <div class="item-left">
           <p style="color: #c4c4c4">{{ item.supervisionTime }}</p>
-          <p style="color: red">待审核</p>
+          <p v-if="item.assessment==0" style="color: red">待审核</p>
+          <p v-if="item.assessment==1" style="color: gray">已审核</p>
         </div>
         <van-cell is-link to="siteInspectionView">
           <template #title>
@@ -57,6 +57,7 @@ import siteInspectionServer from "@/api/siteInspection/siteInspectionServer";
 export default {
   name: "siteInspectionList",
   setup() {
+    window.xm.setNavigationBarTitle({ title: '场所检查情况'})
     const onClickLeft = () => {
       history.back();
     };
@@ -68,23 +69,35 @@ export default {
     const loading = ref(false);
     const finished = ref(false);
     let index = 0;
+    //tab切换
+    const onClickTab= (wh) => {
+      tabIndex.value = wh;
+
+      // 清空列表数据
+      finished.value = false;
+      list.value = [];
+      loading.value = true;
+
+      index = 0;
+      onLoad();
+    };
     const onLoad = () => {
       // 异步更新数据
       new siteInspectionServer()
         .list({
           current: index + 1,
           size: 10,
-          assessment:0,
+          assessment:tabIndex.value,
         })
         .then((res) => {
           list.value.push(...res.records) ;
           // 加载状态结束
-          loading.value = false;
-          index++;
+          loading.value = false;          
           // 数据全部加载完成
           if (res.records.length < 10) {
             finished.value = true;
           }
+          index++;
         });
     };
     // 搜索
@@ -106,6 +119,7 @@ export default {
     };
     return {
       onClickLeft,
+      onClickTab,
       list,
       onLoad,
       loading,

+ 4 - 2
src/views/activityMan/siteInspection/siteInspectionView.vue

@@ -215,8 +215,10 @@ export default {
 
       new siteInspectionServer().save(siteInspection).then((res) => {
         if(res.data=="保存场所检查情况成功"){
-          console.log("保存成功");
-          //添加保存后跳转
+          window.xm.showToast({
+             message:"保存成功!"
+          })
+          history.back();
         }
 
       });

+ 94 - 0
src/views/login/changePassword.vue

@@ -0,0 +1,94 @@
+<template>
+	<van-nav-bar
+	  title="修改密码"
+	  left-arrow
+	  @click-left="onClickLeft"
+	/>
+	
+	<van-form @submit="onSubmit" class="main">
+	  <van-cell-group inset>
+	    	
+        <van-field
+	      v-model="oldpassword"
+	      type="password"
+	      name="旧密码"
+	      label="旧密码"
+	      placeholder="旧密码"
+	      :rules="[{ required: true, message: '请填写旧密码' }]"
+	    />
+	    <van-field
+	      v-model="password"
+	      type="password"
+	      name="新密码"
+	      label="新密码"
+	      placeholder="新密码"
+	      :rules="[{ required: true, message: '请填写新密码' }]"
+	    />
+		<van-field
+		  v-model="password2"
+		  type="password"
+		  name="确认密码"
+		  label="确认密码"
+		  placeholder="确认新密码"
+		  :rules="[{ required: true, message: '请确认新密码' }]"
+		/>
+	  </van-cell-group>
+	  <div class="submit">
+	    <van-button round block type="primary" native-type="submit" @click="save">
+	      确认修改
+	    </van-button>
+	  </div>
+	</van-form>
+	
+</template>
+
+<script>
+import userSets from "@/api/sys/userSets";
+	export default {
+		data() {
+			return{
+                oldpassword:"",
+				password:"",
+				password2:"",
+			}			
+		},
+		methods:{
+			onClickLeft(){
+				history.back();
+			},
+			save(){
+                var that=this;
+                if(that.password!=that.password2){
+                    console.log("确认密码与新密码不一致!");
+                }else{
+                    new userSets()
+                    .ChangePass({
+                        oldPassword: that.oldpassword,
+                        newPassword: that.password
+                    })
+                    .then((res) => {
+                        console.log("修改密码成功!"+"++"+this.password+"++"+this.password2);
+                    });
+                }
+           
+                
+				
+			},
+		},
+	 
+	};
+</script>
+
+<style>
+body {
+  background: #f5f5f5;
+}
+.main {
+  margin-top: 20px;
+}
+.submit{
+    margin-left: 20px;
+    margin-right: 20px;
+  margin-top: 40px;
+}
+</style>

+ 14 - 5
src/views/tab_a/tabAll.vue

@@ -1,4 +1,5 @@
 <template>
+<div class="bg">
 	<van-nav-bar
 	  title="智慧“和顺”"
 	  left-text="民宗干事"
@@ -68,6 +69,7 @@
 		<van-grid-item icon="../../../loginbg/hd_hy.png" text="负责人会议" @click="tohd_hy" />
 		<van-grid-item icon="../../../loginbg/hd_qt.png" to="/setting" text="其他" @click="tohd_qt" />
 	</van-grid>
+</div>
 </template>
 
 <script>
@@ -90,9 +92,8 @@ import userSets from "@/api/sys/userSets";
 
 		created(){
 			let id=this.$route.query.id;
-			this.TokenLogin2();
-			this.getBannerImg();//获取轮播图
-			this.getSelectColor();//获取主题颜色
+			window.xm.setNavigationBarTitle({ title: '智慧“和顺”'})
+			this.TokenLogin2();			
 		},
 
 		methods:{
@@ -120,7 +121,7 @@ import userSets from "@/api/sys/userSets";
 				this.$router.push("/religiousConferenceList");
 			},
 			tohd_qt(){
-				this.$router.push("/securityFacilitiesErrList");
+				this.$router.push("/nonReligiousInformationList");
 			},
 			// 活动场所
 			placeActivity(){
@@ -172,10 +173,15 @@ import userSets from "@/api/sys/userSets";
 					.then((res) => {
 						that.$store.commit('setPcToken',res.PcToken);
 						that.$store.commit('setUser',res.account);
+						that.getBannerImg();//获取轮播图
+						that.getSelectColor();//获取主题颜色
 					});
 
 					//})//上线取消注释
 
+				}else{
+					that.getBannerImg();//获取轮播图
+					that.getSelectColor();//获取主题颜色
 				}
 
 
@@ -321,6 +327,9 @@ import userSets from "@/api/sys/userSets";
 </script>
 
 <style>
-
+.bg{
+	height: 100%;
+	background: #ffffff;
+}
 
 </style>