1.29号

dist/static/css/app.af20b175.css

@@ -0,0 +1 @@
+.left_container[data-v-a75bf722]{padding:15px;width:300px;position:relative;top:60px;left:169px;z-index:2018;border-radius:5px;box-shadow:0 3px 10px hsla(0,0%,100%,.1)}.mian-content[data-v-a75bf722]{width:500px;height:600px;border:1px solid;margin-left:300px;margin-top:100px}#app{font-family:Avenir,Helvetica,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-align:center;color:#2c3e50;margin:0;padding:0}

dist/static/js/672.c27d4959.js

@@ -0,0 +1 @@
+"use strict";(self["webpackChunkdisaster"]=self["webpackChunkdisaster"]||[]).push([[672],{672:function(a,n,e){e.r(n),e.d(n,{default:function(){return l}});var t=e(6252);const r=a=>((0,t.dD)("data-v-f2aa135e"),a=a(),(0,t.Cn)(),a),s=r((()=>(0,t._)("div",{class:"left_container"},[(0,t._)("h2",null,"我是跳转的路由")],-1))),u=[s];function c(a,n){return(0,t.wg)(),(0,t.iD)("div",null,u)}var d=e(3744);const i={},f=(0,d.Z)(i,[["render",c],["__scopeId","data-v-f2aa135e"]]);var l=f}}]);

src/main.js

@@ -1,7 +1,8 @@
 import { createApp } from 'vue'
 import App from './App.vue'
 import router from './router/index.js'
-import Vuex from 'vuex' // 引入vuex
+//import Vuex from 'vuex' // 引入vuex
+//import router from './router' // vue官方的路由
 import ElementUI from 'element-plus'
 import 'element-plus/theme-chalk/index.css' // 引入整个Element样式
 
@@ -10,7 +11,7 @@ import 'element-plus/theme-chalk/index.css' // 引入整个Element样式
 createApp(App)
     .use(router)
     .use(ElementUI)
-    .use(Vuex)
+    //.use(Vuex)
     .mount('#app')
 // const app= createApp(App)
 // app.use(ElementUI)

src/router/index.js

@@ -15,14 +15,20 @@
 // export default router
 import { createRouter, createWebHashHistory, createWebHistory } from "vue-router";
 const router = createRouter({
-    history: createWebHistory(),
+    history: createWebHashHistory(),
     routes: [
+       
         {
             path: '/myHome',
-            name:'zhuye',
+           // name:'zhuye',
             component: () => import('@/components/myHome.vue') // 这是路由的籁加载，也可以其他方式
         },
-              
+        {
+           path: '/myDemo',
+           name:'MyDemo',
+            component: () => import('@/view/myDemo.vue') // 这是路由的籁加载，也可以其他方式
+        },
+                  
    
     ]
 })

src/view/evolutionView.vue

@@ -2,7 +2,7 @@
     <div > 
           <div class="left_container " v-show="isshow">
          
-           <h2 ref="title">{{props.title1}}</h2>
+           <!-- <h2 ref="title">{{props.title1}}</h2> -->
            <!-- <div
            class="img"
            v-for="(item, index) in listArray"
@@ -48,7 +48,7 @@
            <el-button
              size="small"
              type="success"
-             @click="handlexiugai(scope.$index, scope.row)"
+             @click.stop="handlexiugai(scope.$index, scope.row)"
              >修改</el-button
            >
            <el-button
@@ -98,7 +98,7 @@
      >
      <div>
       <el-form>
-      <el-form-item label="timeline" :label-width="formLabelWidth5">
+      <el-form-item label="时间线" :label-width="formLabelWidth5">
          <el-input  v-model="Disastersource.timeline" class="w-50 m-2"  placeholder="请输入"  />
        </el-form-item>
        <el-form-item label="值1"  :label-width="formLabelWidth5">
@@ -136,7 +136,7 @@
            <el-button
              size="small"
              type="success"
-             @click="handlexiugai(scope.$index, scope.row)"
+             @click="handlexiugai2(scope.$index, scope.row)"
              >修改</el-button
            >
            <el-button
@@ -197,12 +197,23 @@
       v-model:page-size="pageSize4"
     small
     background
-    layout="prev, pager, next, jumpe,"      
+    layout="prev, total,pager, next, jumpe,"      
     :total="parseInt(total)"
     class="mt-4"
     @size-change="handleSizeChange"
     @current-change="handleCurrentChange"
   />
+  <!-- <el-pagination
+    v-model:current-page="currentPage4"
+      v-model:page-size="pageSize4"
+      :small="small"
+      :disabled="disabled"
+      :background="background"
+      layout="prev,total, pager, next, jumper"
+      :total="total"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    /> -->
   </div>
        <template #footer>
          <span class="dialog-footer">
@@ -243,7 +254,7 @@
            <el-button
              size="small"
              type="success"
-             @click="handlewater(scope.$index, scope.row)"
+             @click.stop="handlewater(scope.$index, scope.row)"
              >修改</el-button
            >
            <el-button
@@ -366,8 +377,8 @@
    import {RouterView,RouterLink,useRouter } from "vue-router"
    import { ElMessage } from 'element-plus'
    const {currentRouter}=useRouter();
-   let tableHeight=ref(300)
-   const props= defineProps(['title1']);
+   let tableHeight=ref(200)
+  //  const props= defineProps(['title1']);
   //  const emit=defineEmits (["getdata"]);父组件调子组件
   //  const title1=ref("1")
    let userId=ref("5f06c8bc77234f969d13e160b54c27e3");
@@ -444,16 +455,16 @@ let paginationConfig=reactive({
          // 分页查询
 
  function handleSizeChange(val) {
-  console.log("11111"+val)
+  //console.log("11111"+val)
 }
 function handleCurrentChange(val){ 
-  console.log("22222"+val)
-  currentPage4.value=val
+ // console.log("22222"+val)
+ // currentPage4.value=val
   pipelinedata(searchtaggd.value)
 }
    function handleClick(tab, event){
      activeName.value=tab.props.name;
-     console.log(activeName.value);
+     //console.log(activeName.value);
      getdata();
    }
   //火灾接口查询
@@ -468,7 +479,7 @@ function handleCurrentChange(val){
         }
         request(params)
           .then((res) => { 
-            console.log(res)
+           // console.log(res)
            loading.value=false;
             if(activeName.value=='Fire'){
               tableData.value=res.rows
@@ -498,7 +509,7 @@ function pipelinedata(searchtag){
         }
         request(params)
           .then((res) => { 
-            console.log(res)
+           // console.log(res)
             tableData2.value=res.rows
             total.value=res.total
 
@@ -508,7 +519,7 @@ function pipelinedata(searchtag){
           })
   }
    function handleClicktable() {
-     console.log('click')
+    // console.log('click')
    }
    function handleSelectionChange(val){
 
@@ -553,7 +564,7 @@ function pipelinedata(searchtag){
           })
             getdata();
           })
-          .catch((err) => {
+          .catch((err) => {``
             ElMessage({
             message: err.returnMsg,
             type: 'error',
@@ -562,15 +573,21 @@ function pipelinedata(searchtag){
    }
    function handlexiugai(index,row){
     newaddshow.value=true;
+    selectstr.value=row.pname;
+      source.site=row.site;
+      firesid.value=row.sid;
     firepid.value=row.pid;
    }
    function handlewater(index,row){
     waaddshow.value=true;
+    selectstr.value=row.pname;
+      source.site=row.site;
+      firesid.value=row.sid;
     firepid.value=row.pid;
    }
 
    function handleDelete(index,row) {
-     console.log(index, row)
+    // console.log(index, row)
    }
    function queding(){
      selectfun();
@@ -587,7 +604,7 @@ function pipelinedata(searchtag){
    function selectfun(){
    selectstr.value='';
    currentPage4.value=1;
-   console.log(multipleSelection.value)
+  // console.log(multipleSelection.value)
      if(multipleSelection.value.length!=0){
     firepid.value=multipleSelection.value[0].id;
     selectstr.value=multipleSelection.value[0].name;
@@ -628,6 +645,7 @@ function pipelinedata(searchtag){
         }
         request(params)
           .then((res) => { 
+            
             if(activeName.value=='Fire'){
               tableDatafir.value=res.rows;
             }else{
@@ -658,7 +676,7 @@ function pipelinedata(searchtag){
         }
         request(params)
           .then((res) => { 
-           console.log(res);
+           //console.log(res);
            ElMessage({
             message: res.returnMsg,
             type: 'success',
@@ -674,7 +692,7 @@ function pipelinedata(searchtag){
    //getdata();
    })
    
-   defineExpose({isshow,getdata,})
+   defineExpose({isshow,getdata})
    </script>
    <style scoped>
    .demo-pagination-block + .demo-pagination-block {

src/view/myDemo.vue

@@ -7,7 +7,36 @@
          </div>
          <!-- 展示去 -->
          <div class="mian-content">
+          <div class="demo-pagination-block">
+    <div class="demonstration">Jump to</div>
+    <el-pagination
+      v-model:current-page="currentPage3"
+      v-model:page-size="pageSize3"
+      :small="small"
+      :disabled="disabled"
+      :background="background"
+      layout="prev,total, pager, next, jumper"
+      :total="total"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
+  </div>
+  <div class="demo-pagination-block">
+    <div class="demonstration">Total item count</div>
+    <el-pagination
+      v-model:current-page="currentPage1"
+      :page-size="100"
+      :small="small"
+      :disabled="disabled"
+      :background="background"
+      layout="total, prev, pager, next,jumpersizes,"
+      :total="1000"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
+  </div>
           <RouterView></RouterView>
+
          </div>
        </div>
      </template>
@@ -15,10 +44,27 @@
    import { ref, onMounted,defineProps, reactive, } from "vue";
     import {RouterView,RouterLink } from "vue-router"
      import { request, uploadFile } from "@/utils/request";
-
+     const currentPage1 = ref(5)
+    const currentPage2 = ref(5)
+    const currentPage3 = ref(5)
+    const currentPage4 = ref(4)
+    const pageSize2 = ref(100)
+    const pageSize3 = ref(100)
+    const pageSize4 = ref(100)
+    const small = ref(false)
+    const total= ref(1000)
+    const background = ref(false)
+    const disabled = ref(false)
+    function handleSizeChange (){
+      console.log(`${val} items per page`)
+    }
+    function handleCurrentChang() {
+      console.log(`current page: ${val}`)
+    }
     onMounted(()=>{
      //  projectlist()
 
+
 })
     function projectlist(){//列表加载
   

src/view/myIndex.vue

@@ -77,7 +77,8 @@
     <!-- 内容 -->
         <!-- 内容 -->
         <div>
-   <evolutionView ref="evolution" :title1="title1" @getdata="getdata" />
+          <!-- :title1="title1" -->
+   <evolutionView ref="evolution" />
   </div>
   </div>
 </template>
@@ -105,6 +106,8 @@ import vtkColorTransferFunction from "@kitware/vtk.js/Rendering/Core/ColorTransf
 import { I } from "@kitware/vtk.js/macros2.js";
 import { Representation } from '@kitware/vtk.js/Rendering/Core/Property/Constants';
 import evolutionView  from "./evolutionView.vue"
+// import {RouterView,RouterLink} from "vue-router"
+// const router=RouterView();
 
 // const props = {};
 let time = 3 * 60;
@@ -115,14 +118,14 @@ let listArray = reactive([
   { id: 2, img: p3, name: "灾情历史" },
   { id: 3, img: p4, name: "日志" },
 ]);
-let title1=ref("我是父组件")
+// let title1=ref("我是父组件")
 let dialogVisible = ref(false);
 let num = ref(4);
 let starttime = ref(1);
 let endtime = ref(60);
 let timenum = ref(2);
 let isstop = ref(false);
-let arrvalue = reactive();
+let arrvalue = reactive([]);
 let options = reactive([
   {
     value: "fire",
@@ -161,7 +164,11 @@ function add(id) {
   if (id == 2) {
     dialogVisible.value = true;
     evolution.value.isshow=false;
-  }else if(id==0){
+  }else if(id==1){
+    // router.push("/myDemo");
+
+}
+  else if(id==0){
   
     evolution.value.isshow=true;
     evolution.value.getdata();