Browse Source

panding半成品

jz.kai 4 years ago
parent
commit
7d45f7ae2d

+ 1 - 1
.env.development

@@ -1,3 +1,3 @@
 OUT_PUT_DIR=dist/supervision-mobile
 
-VUE_APP_BACKEND_URL=http://192.168.33.225:8086/supervision-server
+VUE_APP_BACKEND_URL=http://localhost:8086/supervision-server

+ 1 - 1
.env.production

@@ -1,3 +1,3 @@
-OUT_PUT_DIR=dist/qylhh-admin
+OUT_PUT_DIR=dist/supervision-mobile
 
 VUE_APP_BACKEND_URL=http://qylhhapi.xiaoxinda.com/enterprise-server

+ 1 - 1
.env.test

@@ -1,3 +1,3 @@
-OUT_PUT_DIR=dist/enterprise-portal
+OUT_PUT_DIR=dist/supervision-mobile
 
 VUE_APP_BACKEND_URL=http://ykt-test.xiaoxinda.com/enterprise-server

+ 10 - 0
src/api/base/incident.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function pageListPending(formData){
+  return request.post(constant.serverUrl + "/mobile/incidentApi/pageListPending", formData);
+}
+
+export default {
+  pageListPending
+}

+ 2 - 2
src/routers/index.js

@@ -22,8 +22,8 @@ export const constantRoutes = [
     ...baseRouters,
   ];
   
-  // Array.prototype.push.apply(routes, caseRouters);
-  // Array.prototype.push.apply(routes, sysRouters);
+  // Array.prototype.push.apply(router, baseRouters);
+  // Array.prototype.push.apply(router, sysRouters);
   
   var router = new Router({
     routes: constantRoutes

+ 71 - 64
src/views/base/incident-panding.vue

@@ -1,83 +1,90 @@
 <template>
   <div>
     <header class="mui-bar mui-bar-nav bg-blue shaw-no">
-      <a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
+      <a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left" @click="goBack"></a>
       <h1 class="mui-title">我的督办</h1>
     </header>
     <div class="mui-content">
-      <div class="von-db-top flex-sp">
-        <a id="showUserPicker" class="mui-navigate-right mui-ellipsis" href=""
-          >督办类型</a
-        >
+      <!-- <div class="von-db-top flex-sp">
+        <a id="showUserPicker" class="mui-navigate-right mui-ellipsis" href="">督办类型</a>
         <a class="mui-navigate-right mui-ellipsis" href="">督办进度</a>
-        <a class="mui-navigate-right mui-ellipsis" href=""
-          >2020-03-01至2020-03-31</a
-        >
-      </div>
+        <a class="mui-navigate-right mui-ellipsis" href="">2020-03-01至2020-03-31</a>
+      </div> -->
       <ul class="mui-table-view von-db-list">
-        <li class="mui-table-view-cell blue-line">
-          <h4>省委领导批示</h4>
-          <div class="von-db-text">
-            <div class="flex-sp">
-              <div class="mui-col-xs-9 mui-ellipsis-2">
-                关于对重点企业清洁生产审核工作进展进行督办的通知化
+        <div v-for="item in tableData" :key="item.id" @click="ReIncidentDetail(item.id)">
+          <li v-bind:class="'mui-table-view-cell ' + item.warningLight">
+            <h4>{{item.caseTypeName}}</h4>
+            <div class="von-db-text">
+              <div class="flex-sp">
+                <div class="mui-col-xs-9 mui-ellipsis-2">
+                  {{item.title}}
+                </div>
+                <div class="mui-col-xs-3 mui-text-right">{{item.isFinishedName}}</div>
               </div>
-              <div class="mui-col-xs-3 mui-text-right">已交办</div>
+              <p class="mui-h6 mui-ellipsis flex-sp">
+                交办时间 {{item.lastStepTime}}<span>交办人 {{item.lastStepPersonName}}</span>
+              </p>
             </div>
-            <p class="mui-h6 mui-ellipsis flex-sp">
-              登记时间 2021-03-20<span>登记人 王小山</span>
-            </p>
-          </div>
-        </li>
-        <li class="mui-table-view-cell red-line">
-          <h4>省委领导批示</h4>
-          <div class="von-db-text">
-            <div class="flex-sp">
-              <div class="mui-col-xs-9 mui-ellipsis-2">
-                关于对重点企业清洁生产审核工作进展进行督办的通知化
-              </div>
-              <div class="mui-col-xs-3 mui-text-right">已交办</div>
-            </div>
-            <p class="mui-h6 mui-ellipsis flex-sp">
-              登记时间 2021-03-20<span>登记人 王小山</span>
-            </p>
-          </div>
-        </li>
-        <li class="mui-table-view-cell yellow-line">
-          <h4>重要工作</h4>
-          <div class="von-db-text">
-            <div class="flex-sp">
-              <div class="mui-col-xs-9 mui-ellipsis-2">
-                关于对重点企业清洁生产审核工作进展进行督办的通知化
-              </div>
-              <div class="mui-col-xs-3 mui-text-right">已交办</div>
-            </div>
-            <p class="mui-h6 mui-ellipsis flex-sp">
-              登记时间 2021-03-20<span>登记人 王小山</span>
-            </p>
-          </div>
-        </li>
-        <li class="mui-table-view-cell green-line">
-          <h4>省委领导批示</h4>
-          <div class="von-db-text">
-            <div class="flex-sp">
-              <div class="mui-col-xs-9 mui-ellipsis-2">
-                关于对重点企业清洁生产审核工作进展进行督办的通知化
-              </div>
-              <div class="mui-col-xs-3 mui-text-right">已交办</div>
-            </div>
-            <p class="mui-h6 mui-ellipsis flex-sp">
-              登记时间 2021-03-20<span>登记人 王小山</span>
-            </p>
-          </div>
-        </li>
+          </li>
+        </div>
       </ul>
     </div>
   </div>
 </template>
 
 <script>
-export default {};
+import incidentApi from "@/api/base/incident";
+
+export default {
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        id: "",
+        title: "",
+      },
+      loading: false,
+      tableData: [],
+      item: {
+        caseTypeName:""
+      }
+    };
+  },
+  methods: {
+		goBack() {
+			this.$router.back(-1);
+		},
+		ReIncidentDetail(id) {
+      var self = this;
+			self.$router.push({ path: this.redirect || "/base/incident/detail" });
+		},
+	},
+  mounted: function () {
+    var self = this;
+
+    self.loading = true;
+
+    var formData = new FormData();
+
+    formData.append("title", self.queryModel.title);
+    formData.append("caseType", self.queryModel.caseType);
+
+    incidentApi
+    .pageListPending(formData)
+    .then(function (response) {
+      self.loading = false;
+
+      var jsonData = response;
+
+      self.tableData = jsonData.data;
+      console.log(self.tableData);
+    })
+    .catch((error) => {
+      self.loading = false;
+    });
+  },
+};
 </script>
 
 <style>

+ 5 - 5
src/views/home.vue

@@ -15,7 +15,7 @@
 			</div>
 		</div>
 		<nav class="mui-bar mui-bar-tab">
-			<a id="defaultTab" class="mui-tab-item mui-active" href="#/base/incident/pending">
+			<a class="mui-tab-item mui-active" href="#/home">
 				<span class="mui-icon iconfont iconduchaduban"></span>
 				<span class="mui-tab-label">督办</span>
 			</a>
@@ -35,12 +35,12 @@
 export default {
 	methods: {
 		ReIncidentDetail() {
-		var self = this;
-		self.$router.push({ path: this.redirect || "/base/incident/detail" });
+			var self = this;
+			self.$router.push({ path: this.redirect || "/base/incident/detail" });
 		},
 		ReIncidentPending() {
-		var self = this;
-		self.$router.push({ path: this.redirect || "/base/incident/pending" });
+			var self = this;
+			self.$router.push({ path: this.redirect || "/base/incident/pending" });
 		},
 	}
 }

+ 0 - 14
src/views/login.vue

@@ -1,7 +1,6 @@
 <template>
   <div class="login-container">
     <header class="mui-bar mui-bar-nav shaw-no">
-			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
 			<h1 class="mui-title">登录</h1>
 		</header>
 		<div class="mui-content von-login">
@@ -29,19 +28,6 @@
 				</div>
 			</div>
 		</div>
-    <!-- <div class="login-form">
-      <div class="login-form-logo">
-        <img src="../assets/logo.png" width="100"/>
-        <h3>荆州市委督查办公平台</h3>
-        <form>
-          <ul>
-            <li><input type="text" v-model="loginForm.userName"/></li>
-            <li><input type="password" v-model="loginForm.password"/></li>
-            <li><button @click="handleLogin" type="button">登录</button></li>
-          </ul>
-        </form>
-      </div>
-    </div> -->
   </div>
 </template>
 <script>

+ 6 - 2
src/views/sys/user-detail.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <header class="mui-bar mui-bar-nav shaw-no">
-			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
+			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left" @click="goBack"></a>
 			<h1 class="mui-title">我的</h1>
 		</header>
 		<div class="mui-content">
@@ -51,7 +51,11 @@
 
 <script>
 export default {
- 
+	methods: {
+		goBack() {
+			this.$router.back(-1);
+		},
+	}
 };
 </script>